From 508e2f3b4dab67c20aa43a70e33eff3ae6fa5b6d Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Thu, 28 Mar 2013 18:17:47 -0400 Subject: [PATCH] Signed-off-by: StevenRS11 --- StevenDimDoors/mod_pocketDim/CommonTickHandler.java | 8 ++++---- StevenDimDoors/mod_pocketDim/EventHookContainer.java | 2 +- StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java | 2 +- StevenDimDoors/mod_pocketDim/dimHelper.java | 3 ++- StevenDimDoors/mod_pocketDim/mod_pocketDim.java | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java index e5d9940..4450641 100644 --- a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java +++ b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java @@ -98,7 +98,7 @@ public class CommonTickHandler implements ITickHandler if(tickCount2>10&&dimHelper.blocksToDecay!=null) { tickCount2=0; - if(!dimHelper.blocksToDecay.isEmpty()&&mod_pocketDim.limbo!=null) + if(!dimHelper.blocksToDecay.isEmpty()&&dimHelper.getWorld(mod_pocketDim.limboDimID)!=null) { @@ -107,7 +107,7 @@ public class CommonTickHandler implements ITickHandler int index = rand.nextInt(dimHelper.blocksToDecay.size()); Point3D point = (Point3D) dimHelper.blocksToDecay.get(index); - int blockID = mod_pocketDim.limbo.getBlockId(point.getX(), point.getY(), point.getZ()); + int blockID = dimHelper.getWorld(mod_pocketDim.limboDimID).getBlockId(point.getX(), point.getY(), point.getZ()); int idToSet=Block.stone.blockID; if(blockID==0||blockID==mod_pocketDim.blockLimboID) @@ -133,7 +133,7 @@ public class CommonTickHandler implements ITickHandler idToSet=Block.cobblestone.blockID; } - if(blockID==Block.gravel.blockID&&!mod_pocketDim.limbo.isAirBlock(point.getX(), point.getY()-1, point.getZ())) + if(blockID==Block.gravel.blockID&&!dimHelper.getWorld(mod_pocketDim.limboDimID).isAirBlock(point.getX(), point.getY()-1, point.getZ())) { idToSet=mod_pocketDim.blockLimboID; } @@ -147,7 +147,7 @@ public class CommonTickHandler implements ITickHandler if(idToSet!=-1) { - mod_pocketDim.limbo.setBlockWithNotify(point.getX(), point.getY(), point.getZ(), idToSet); + dimHelper.getWorld(mod_pocketDim.limboDimID).setBlockWithNotify(point.getX(), point.getY(), point.getZ(), idToSet); } } diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 9443cdf..1280f9a 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -55,7 +55,7 @@ public class EventHookContainer dimHelper.instance.linksForRendering.clear(); dimHelper.instance.initPockets(); - mod_pocketDim.limbo= dimHelper.instance.getWorld(mod_pocketDim.limboDimID); + } diff --git a/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java b/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java index fcea6e4..e226f86 100644 --- a/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java +++ b/StevenDimDoors/mod_pocketDim/PlayerRespawnTracker.java @@ -44,7 +44,7 @@ public class PlayerRespawnTracker implements IPlayerTracker for(EntityItem drop : mod_pocketDim.limboSpawnInventory) { - player.inventory.addItemStackToInventory(drop.getEntityItem()); + // player.inventory.addItemStackToInventory(drop.getEntityItem()); } diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index 5cd1300..2ee453a 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -132,6 +132,7 @@ public class dimHelper extends DimensionManager public void teleportToLimbo(World world,LinkData linkData, EntityPlayer player) { + /** EntityPlayerMP playerMP = (EntityPlayerMP) player; player.fallDistance=-700; @@ -151,7 +152,7 @@ public class dimHelper extends DimensionManager //System.out.println(worldLimbo.getHeightValue( MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posZ))); playerMP.mcServer.getConfigurationManager().transferPlayerToDimension(playerMP, mod_pocketDim.limboDimID, new pocketTeleporter((WorldServer) this.getWorld(mod_pocketDim.limboDimID), linkData)); - + **/ } private Entity teleportEntity(World oldWorld, Entity entity, LinkData link) //this beautiful teleport method is based off of xCompWiz's teleport function. { diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index c1b5c65..187cce4 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -196,7 +196,7 @@ public class mod_pocketDim public static RiftGenerator riftGen = new RiftGenerator(); - public static World limbo= null; + // public static World limbo= null; public static long genTime; public static boolean enableRiftGrief; @@ -599,7 +599,7 @@ public class mod_pocketDim { try { - this.limbo=null; + dimHelper.instance.save(); dimHelper.instance.unregsisterDims(); dimHelper.dimList.clear();