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

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
Conversation 0 Commits 14 Files Changed 23 +29 -20
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7687a77332 - Show all commits

10
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

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

39
StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
View File

@@ -24,24 +24,27 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo
@Override
public void updateEntity()
{ // every tick?
if (PocketManager.getDimensionData(this.worldObj) != null &&
PocketManager.getDimensionData(this.worldObj).isPocketDimension() &&
!this.worldObj.isRemote)
{
if(PocketManager.getLink(this.xCoord,this.yCoord,this.zCoord,this.worldObj)==null)
{
return;
}
if (this.chunkTicket == null)
{
chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL);
chunkTicket.getModData().setInteger("goldDimDoorX", xCoord);
chunkTicket.getModData().setInteger("goldDimDoorY", yCoord);
chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord);
forceChunkLoading(chunkTicket,this.xCoord,this.zCoord);
}
}
if (PocketManager.getDimensionData(this.worldObj) != null &&
PocketManager.getDimensionData(this.worldObj).isPocketDimension() &&
!this.worldObj.isRemote)
{
if(PocketManager.getLink(this.xCoord,this.yCoord,this.zCoord,this.worldObj)==null)
{
return;
}
if (this.chunkTicket == null)
{
if(chunkTicket == null)
{
return;
}
chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL);
chunkTicket.getModData().setInteger("goldDimDoorX", xCoord);
chunkTicket.getModData().setInteger("goldDimDoorY", yCoord);
chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord);
forceChunkLoading(chunkTicket,this.xCoord,this.zCoord);
}
}
}
@Override