StevenDimDoors/mod_pocketDim/EventHookContainer.java

@@ -10,11 +10,11 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
-import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.world.LimboProvider;
+import StevenDimDoors.mod_pocketDim.world.PocketProvider;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -70,23 +70,20 @@ public class EventHookContainer
     {
     	Entity entity = event.entity;
     	
-    	if (entity instanceof EntityPlayer && properties.LimboEnabled)
+    	if (entity instanceof EntityPlayer && properties.LimboEnabled &&
+    		entity.worldObj.provider instanceof PocketProvider)
     	{
-    		NewDimData dimension = PocketManager.getDimensionData(entity.worldObj);
-    		if (dimension.isDungeon())
+    		EntityPlayer player = (EntityPlayer) entity;
+    		if (!properties.LimboReturnsInventoryEnabled)
     		{
-	    		EntityPlayer player = (EntityPlayer) entity;
-	    		if (!properties.LimboReturnsInventoryEnabled)
-	    		{
-	    			player.inventory.clearInventory(-1, -1);
-	    		}
-	    		ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand);
-	    		Point4D destination = new Point4D(coords.posX, coords.posY, coords.posZ, mod_pocketDim.properties.LimboDimensionID);
-	    		DDTeleporter.teleportEntity(player, destination, false);
-	    		player.setEntityHealth(player.getMaxHealth());
-	    		event.setCanceled(true);
-	    		return false;
+    			player.inventory.clearInventory(-1, -1);
     		}
+    		ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand);
+    		Point4D destination = new Point4D(coords.posX, coords.posY, coords.posZ, mod_pocketDim.properties.LimboDimensionID);
+    		DDTeleporter.teleportEntity(player, destination, false);
+    		player.setEntityHealth(player.getMaxHealth());
+    		event.setCanceled(true);
+    		return false;
     	}
     	return true;
     }

StevenDimDoors/mod_pocketDim/world/PocketProvider.java

@@ -17,14 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class PocketProvider extends WorldProvider
 {
-	public int exitXCoord;
-	public int exitYCoord;
-	public int exitZCoord;
-	public int exitDimID;
-	public boolean hasNoSky = true;
-
-	public boolean isSavingSchematic= false;
-	public int dimToSave;
 	private DDProperties properties;
 	private MonolithSpawner spawner;
 
@@ -38,8 +30,7 @@ public class PocketProvider extends WorldProvider
 	@Override
 	protected void registerWorldChunkManager()
 	{
-		super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.pocketBiome,1,1);
-		//this.dimensionId = ConfigAtum.dimensionID;
+		super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.pocketBiome, 1, 1);
 	}
 	
 	@Override
@@ -48,28 +39,18 @@ public class PocketProvider extends WorldProvider
 		return (dimensionId == 0 ? null : "DimensionalDoors/pocketDimID" + dimensionId);
 	}
 
-	public void saveAsSchematic(int id)
-	{
-		this.isSavingSchematic=true;
-		this.dimensionId=id;
-
-	}
-
+	@Override
 	public Vec3 getSkyColor(Entity cameraEntity, float partialTicks)
 	{
 		setCloudRenderer( new CloudRenderBlank());
 		return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
-
 	}
 
-
-
 	@SideOnly(Side.CLIENT)
 	@Override
 	public Vec3 getFogColor(float par1, float par2)
 	{
 		return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
-
 	}
 
 	@Override
@@ -90,6 +71,7 @@ public class PocketProvider extends WorldProvider
 		return false;
 	}
 	
+	@Override
 	public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
 	{
 		return false;
@@ -104,6 +86,7 @@ public class PocketProvider extends WorldProvider
 		return "PocketDim " + this.dimensionId;
 	}
 
+	@Override
 	public int getRespawnDimension(EntityPlayerMP player)
 	{
 		int respawnDim;
@@ -124,8 +107,15 @@ public class PocketProvider extends WorldProvider
 		return respawnDim;
 	}
 
+	@Override
 	public boolean canRespawnHere()
 	{
 		return false;
 	}
+	
+	@Override
+	public int getActualHeight()
+	{
+		return 256;
+	}
 }