Signed-off-by: StevenRS11 <stevenrs11@aol.com>

This commit is contained in:
StevenRS11
2013-03-28 18:17:47 -04:00
parent c8bd248433
commit 508e2f3b4d
5 changed files with 10 additions and 9 deletions

View File

@@ -98,7 +98,7 @@ public class CommonTickHandler implements ITickHandler
if(tickCount2>10&&dimHelper.blocksToDecay!=null) if(tickCount2>10&&dimHelper.blocksToDecay!=null)
{ {
tickCount2=0; 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()); int index = rand.nextInt(dimHelper.blocksToDecay.size());
Point3D point = (Point3D) dimHelper.blocksToDecay.get(index); 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; int idToSet=Block.stone.blockID;
if(blockID==0||blockID==mod_pocketDim.blockLimboID) if(blockID==0||blockID==mod_pocketDim.blockLimboID)
@@ -133,7 +133,7 @@ public class CommonTickHandler implements ITickHandler
idToSet=Block.cobblestone.blockID; 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; idToSet=mod_pocketDim.blockLimboID;
} }
@@ -147,7 +147,7 @@ public class CommonTickHandler implements ITickHandler
if(idToSet!=-1) 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);
} }
} }

View File

@@ -55,7 +55,7 @@ public class EventHookContainer
dimHelper.instance.linksForRendering.clear(); dimHelper.instance.linksForRendering.clear();
dimHelper.instance.initPockets(); dimHelper.instance.initPockets();
mod_pocketDim.limbo= dimHelper.instance.getWorld(mod_pocketDim.limboDimID);
} }

View File

@@ -44,7 +44,7 @@ public class PlayerRespawnTracker implements IPlayerTracker
for(EntityItem drop : mod_pocketDim.limboSpawnInventory) for(EntityItem drop : mod_pocketDim.limboSpawnInventory)
{ {
player.inventory.addItemStackToInventory(drop.getEntityItem()); // player.inventory.addItemStackToInventory(drop.getEntityItem());
} }

View File

@@ -132,6 +132,7 @@ public class dimHelper extends DimensionManager
public void teleportToLimbo(World world,LinkData linkData, EntityPlayer player) public void teleportToLimbo(World world,LinkData linkData, EntityPlayer player)
{ {
/**
EntityPlayerMP playerMP = (EntityPlayerMP) player; EntityPlayerMP playerMP = (EntityPlayerMP) player;
player.fallDistance=-700; 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))); //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)); 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. private Entity teleportEntity(World oldWorld, Entity entity, LinkData link) //this beautiful teleport method is based off of xCompWiz's teleport function.
{ {

View File

@@ -196,7 +196,7 @@ public class mod_pocketDim
public static RiftGenerator riftGen = new RiftGenerator(); public static RiftGenerator riftGen = new RiftGenerator();
public static World limbo= null; // public static World limbo= null;
public static long genTime; public static long genTime;
public static boolean enableRiftGrief; public static boolean enableRiftGrief;
@@ -599,7 +599,7 @@ public class mod_pocketDim
{ {
try try
{ {
this.limbo=null;
dimHelper.instance.save(); dimHelper.instance.save();
dimHelper.instance.unregsisterDims(); dimHelper.instance.unregsisterDims();
dimHelper.dimList.clear(); dimHelper.dimList.clear();