From 78aefb1547d0c22264f8a9bd83216cdb4297b9b1 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Mon, 24 Jun 2013 20:08:08 -0400 Subject: [PATCH 1/3] Fixed rift doors not going away. --- StevenDimDoors/mod_pocketDim/TransientDoor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/TransientDoor.java b/StevenDimDoors/mod_pocketDim/TransientDoor.java index d52f679..354607f 100644 --- a/StevenDimDoors/mod_pocketDim/TransientDoor.java +++ b/StevenDimDoors/mod_pocketDim/TransientDoor.java @@ -91,9 +91,10 @@ public class TransientDoor extends ExitDoor { if(dimHelper.dimList.containsKey(linkData.destDimID)) { - dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity); par1World.setBlock(par2, par3-1, par4, 0); par1World.setBlock(par2, par3, par4, properties.RiftBlockID); + dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity); + } } @@ -105,9 +106,10 @@ public class TransientDoor extends ExitDoor { if(dimHelper.dimList.containsKey(linkData.destDimID)) { - dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity); par1World.setBlock(par2, par3, par4, 0); par1World.setBlock(par2, par3+1, par4, properties.RiftBlockID); + dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity); + } } From 5b53399432d22a738a31bc27634f47719e5b6fa9 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Tue, 25 Jun 2013 00:00:58 -0400 Subject: [PATCH 2/3] removed regen command pending schematicLoader --- StevenDimDoors/mod_pocketDim/mod_pocketDim.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 320f7e1..bd9ab9e 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -391,7 +391,7 @@ public class mod_pocketDim @ServerStarting public void serverStarting(FMLServerStartingEvent event) { - CommandRegenPocket.instance().register(event); + //CommandRegenPocket.instance().register(event); CommandCreateDungeonRift.instance().register(event); CommandDeleteAllLinks.instance().register(event); CommandDeleteDimensionData.instance().register(event); From 60972eab21ba964193e4e32db670812e3252129e Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Tue, 25 Jun 2013 09:15:19 -0400 Subject: [PATCH 3/3] Prevented 'overworld not loaded' crash, temp fix --- StevenDimDoors/mod_pocketDim/RiftGenerator.java | 7 ++++++- StevenDimDoors/mod_pocketDim/helpers/dimHelper.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index 0877c99..424cc58 100644 --- a/StevenDimDoors/mod_pocketDim/RiftGenerator.java +++ b/StevenDimDoors/mod_pocketDim/RiftGenerator.java @@ -18,7 +18,7 @@ public class RiftGenerator implements IWorldGenerator public static final int MAX_CLUSTER_GENERATION_CHANCE = 10000; private static final int CLUSTER_GROWTH_CHANCE = 80; private static final int MAX_CLUSTER_GROWTH_CHANCE = 100; - private static final int MIN_RIFT_Y = 21; + private static final int MIN_RIFT_Y = 4; private static final int MAX_RIFT_Y = 250; private static final int CHUNK_LENGTH = 16; private static final int GATEWAY_RADIUS = 4; @@ -41,6 +41,11 @@ public class RiftGenerator implements IWorldGenerator { return; } + + if(dimHelper.getWorld(0)==null) + { + return; + } int x, y, z; int attempts; diff --git a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index 991dedd..45de634 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java @@ -906,6 +906,10 @@ public class dimHelper extends DimensionManager public LinkData createPocket(LinkData link , boolean isGoingDown, boolean isRandomRift) { DDProperties properties = DDProperties.instance(); + if(dimHelper.getWorld(0)==null) + { + return link; + } if (dimHelper.getWorld(link.locDimID) == null) {