Merge pull request #82 from SenseiKiwi/rewrite

Fixed Various Bugs
This commit is contained in:
StevenRS11 2013-09-03 21:35:52 -07:00
commit 4f093751ee
3 changed files with 4 additions and 7 deletions

View file

@ -189,7 +189,7 @@ public class DDTeleporter
}
// Determine if our destination is in another realm.
boolean difDest = entity.dimension == destination.getDimension();
boolean difDest = entity.dimension != destination.getDimension();
if (difDest)
{
// Destination isn't loaded? Then we need to load it.
@ -197,9 +197,9 @@ public class DDTeleporter
if (newWorld == null)
{
DimensionManager.initDimension(destination.getDimension());
}
newWorld = DimensionManager.getWorld(destination.getDimension());
}
}
else
{
newWorld = (WorldServer) oldWorld;

View file

@ -61,11 +61,8 @@ public class TransientDoor extends WarpDoor
int var12 = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3);
int orientation = world.getBlockMetadata(x, y - 1, z);
if (!world.isRemote && (orientation >= 4 && orientation <= 7) && (orientation - 4) == var12 &&
world.getBlockId(x, y - 1, z) == this.blockID)
if (!world.isRemote && orientation == var12 && world.getBlockId(x, y - 1, z) == this.blockID)
{
this.onPoweredBlockChange(world, x, y, z, false);
DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId);
if (link != null)
{

View file

@ -146,7 +146,7 @@ public class GatewayGenerator implements IWorldGenerator
}
//Place the shiny transient door into a dungeon
ItemDimensionalDoor.placeDoorBlock(world, x, y + 1, z, 0, mod_pocketDim.transientDoor);
ItemDimensionalDoor.placeDoorBlock(world, x, y, z, 0, mod_pocketDim.transientDoor);
}
}
}