Merge remote-tracking branch 'upstream/master'

This commit is contained in:
SenseiKiwi 2014-01-09 18:19:18 -04:00
commit ad92b1c2c4
2 changed files with 14 additions and 1 deletions

View file

@ -392,15 +392,28 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
}
if (canUse)
{
// Teleport the entity through the link, if it exists
DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId);
if (link != null)
{
DDTeleporter.traverseDimDoor(world, link, entity, this);
try
{
DDTeleporter.traverseDimDoor(world, link, entity, this);
}
catch(Exception e)
{
System.err.println("Something when wrong teleporting to a dim:");
e.printStackTrace();
}
}
// Close the door only after the entity goes through
// so players don't have it slam in their faces.
this.onPoweredBlockChange(world, x, y, z, false);
}
}
else if (world.getBlockId(x, y + 1, z) == this.blockID)