apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on exiting personal pocket dimension #185

Closed
notabadminer wants to merge 67 commits from master into master
pull from: master
merge into: apex:master
Conversation 1 Commits 67 Files Changed 366 +5 -1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91f96c825c - Show all commits

4
src/main/java/StevenDimDoors/mod_pocketDim/network/ClientJoinPacket.java
View File

@@ -1,5 +1,6 @@
package StevenDimDoors.mod_pocketDim.network; package StevenDimDoors.mod_pocketDim.network;
import StevenDimDoors.mod_pocketDim.core.NewDimData;
import StevenDimDoors.mod_pocketDim.core.PocketManager; import StevenDimDoors.mod_pocketDim.core.PocketManager;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;
@@ -30,7 +31,10 @@ public class ClientJoinPacket extends DimDoorsPacket {
@Override @Override
public void handleClient(World world, EntityPlayer player) { public void handleClient(World world, EntityPlayer player) {
NewDimData dimensionData = PocketManager.getDimensionData(player.worldObj);
if (dimensionData.isPocketDimension())
player.worldObj.provider.registerWorld(player.worldObj);
} }
@Override @Override

2
src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java
View File

@@ -89,7 +89,7 @@ public class PocketProvider extends WorldProvider
@Override @Override
protected void generateLightBrightnessTable() protected void generateLightBrightnessTable()
{ {
if(PocketManager.getDimensionData(this.dimensionId).type() == DimensionType.POCKET) if(!PocketManager.isLoaded() || PocketManager.getDimensionData(this.dimensionId).type() == DimensionType.POCKET)
{ {
super.generateLightBrightnessTable(); super.generateLightBrightnessTable();
return; return;