From 91f96c825c22598167cd288a6a76eb8957cc4bcb Mon Sep 17 00:00:00 2001 From: CannibalVox Date: Tue, 17 Mar 2015 11:25:11 -0500 Subject: [PATCH] Don't try to check a dim type before we have dim data. Relight dimension when we get it. --- .../mod_pocketDim/network/ClientJoinPacket.java | 4 ++++ .../StevenDimDoors/mod_pocketDim/world/PocketProvider.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/network/ClientJoinPacket.java b/src/main/java/StevenDimDoors/mod_pocketDim/network/ClientJoinPacket.java index 9cbd969..98e790f 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/network/ClientJoinPacket.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/network/ClientJoinPacket.java @@ -1,5 +1,6 @@ package StevenDimDoors.mod_pocketDim.network; +import StevenDimDoors.mod_pocketDim.core.NewDimData; import StevenDimDoors.mod_pocketDim.core.PocketManager; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -30,7 +31,10 @@ public class ClientJoinPacket extends DimDoorsPacket { @Override public void handleClient(World world, EntityPlayer player) { + NewDimData dimensionData = PocketManager.getDimensionData(player.worldObj); + if (dimensionData.isPocketDimension()) + player.worldObj.provider.registerWorld(player.worldObj); } @Override diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java index 7caaa26..bebaac7 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java @@ -89,7 +89,7 @@ public class PocketProvider extends WorldProvider @Override protected void generateLightBrightnessTable() { - if(PocketManager.getDimensionData(this.dimensionId).type() == DimensionType.POCKET) + if(!PocketManager.isLoaded() || PocketManager.getDimensionData(this.dimensionId).type() == DimensionType.POCKET) { super.generateLightBrightnessTable(); return;