Merging Canvox's patch #107

Merged
StevenRS11 merged 14 commits from master into 1.6.2-code 2013-12-17 02:58:44 +00:00
2 changed files with 29 additions and 20 deletions
Showing only changes of commit 7687a77332 - Show all commits

View File

@@ -319,7 +319,13 @@ public class mod_pocketDim
CommandCreatePocket.instance().register(event); CommandCreatePocket.instance().register(event);
CommandTeleportPlayer.instance().register(event); CommandTeleportPlayer.instance().register(event);
try
{
ChunkLoaderHelper.loadChunkForcedWorlds(event); ChunkLoaderHelper.loadChunkForcedWorlds(event);
} }
catch(Exception e)
{
System.out.println("Loading chunkloaders failed");
}
}
} }

View File

@@ -34,13 +34,16 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo
} }
if (this.chunkTicket == null) if (this.chunkTicket == null)
{ {
if(chunkTicket == null)
{
return;
}
chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL); chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL);
chunkTicket.getModData().setInteger("goldDimDoorX", xCoord); chunkTicket.getModData().setInteger("goldDimDoorX", xCoord);
chunkTicket.getModData().setInteger("goldDimDoorY", yCoord); chunkTicket.getModData().setInteger("goldDimDoorY", yCoord);
chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord); chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord);
forceChunkLoading(chunkTicket,this.xCoord,this.zCoord); forceChunkLoading(chunkTicket,this.xCoord,this.zCoord);
} }
} }
} }