From c6f26669d0ac0fed4de59a0c6ed48737aa36d9d5 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Wed, 17 Apr 2013 16:00:30 -0400 Subject: [PATCH] Signed-off-by: StevenRS11 --- StevenDimDoors/mod_pocketDim/RiftGenerator.java | 2 +- StevenDimDoors/mod_pocketDim/SchematicLoader.java | 4 +++- StevenDimDoors/mod_pocketDim/dimHatch.java | 2 ++ StevenDimDoors/mod_pocketDim/dimHelper.java | 10 +++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index 8b9df98..5407a00 100644 --- a/StevenDimDoors/mod_pocketDim/RiftGenerator.java +++ b/StevenDimDoors/mod_pocketDim/RiftGenerator.java @@ -30,7 +30,7 @@ public class RiftGenerator implements IWorldGenerator //Long ntime = System.nanoTime(); shouldGenHere=true; - if(world.provider.getDimensionName()=="PocketDim"||!mod_pocketDim.riftsInWorldGen ||world.isRemote) + if(world.provider.getDimensionName()=="PocketDim"||!mod_pocketDim.riftsInWorldGen ||world.isRemote||world.provider.dimensionId==1) { this.shouldGenHere=false; diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java index 9e9db64..d92d03d 100644 --- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java +++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java @@ -863,8 +863,10 @@ public class SchematicLoader dimHelper.instance.createLink(sideLink); dimHelper.instance.createLink(sideLink.destDimID , sideLink.locDimID, sideLink.destXCoord, sideLink.destYCoord, sideLink.destZCoord, sideLink.locXCoord, sideLink.locYCoord, sideLink.locZCoord, dimHelper.instance.flipDoorMetadata(sideLink.linkOrientation)); + int blockID=Block.stoneBrick.blockID; + System.out.println("gennedExit"); - setBlockDirectly(world,point.getX(), point.getY()-2, point.getZ(), Block.stone.blockID,0); + setBlockDirectly(world,point.getX(), point.getY()-3, point.getZ(), Block.stone.blockID,0); // setBlockDirectly(world,point.getX(), point.getY()-1, point.getZ(),mod_pocketDim.ExitDoorID,sideLink.linkOrientation); // setBlockDirectly(world,point.getX(), point.getY(), point.getZ(),mod_pocketDim.ExitDoorID,8); diff --git a/StevenDimDoors/mod_pocketDim/dimHatch.java b/StevenDimDoors/mod_pocketDim/dimHatch.java index 060a08b..8be5f3d 100644 --- a/StevenDimDoors/mod_pocketDim/dimHatch.java +++ b/StevenDimDoors/mod_pocketDim/dimHatch.java @@ -51,6 +51,8 @@ public class dimHatch extends BlockTrapDoor DimData dimData = (DimData) dimHelper.instance.dimList.get(par1World.provider.dimensionId); LinkData exitLink=dimData.exitDimLink; + exitLink.locDimID=par1World.provider.dimensionId; + dimHelper.instance.teleportToPocket(par1World, exitLink, par5Entity); diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index 35b3c51..c2a4c6b 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -184,6 +184,8 @@ public class dimHelper extends DimensionManager if ((entity instanceof EntityPlayerMP)) { + + EntityPlayerMP player = (EntityPlayerMP)entity; //player.closeScreen(); @@ -218,7 +220,6 @@ public class dimHelper extends DimensionManager } - WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4); } @@ -283,7 +284,10 @@ public class dimHelper extends DimensionManager } - + if(entity instanceof EntityPlayerMP) + { + WorldServer.class.cast(newWorld).theChunkProviderServer.loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4); + } return entity; @@ -863,7 +867,7 @@ public class dimHelper extends DimensionManager if(link1!=null) { - locationDimData.exitDimLink=new LinkData(link1.locDimID, link1.locDimID, link1.locXCoord, link1.locYCoord, link1.locZCoord, link1.locXCoord, link1.locYCoord, link1.locZCoord, false); + //locationDimData.exitDimLink=new LinkData(link1.locDimID, link1.locDimID, link1.locXCoord, link1.locYCoord, link1.locZCoord, link1.locXCoord, link1.locYCoord, link1.locZCoord, false); } }