apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Added Settings and Minor Preemptive Fix

Browse Source 
Added a setting to DDProperties for controlling the max distance that
players can be moved randomly when they're sent to Limbo. We previously
had a setting for the same except for leaving Limbo. Cleaned up some of
the related code a little. Added another setting for the chance of rifts
dropping World Thread on block destruction. Also fixed a potential NPE
in EventHookContainer that could arise theoretically arise if a
non-Vanilla door was attached to a rift.
This commit is contained in:
SenseiKiwi
2014-03-16 10:01:35 -04:00
parent 84eee1b155
commit cfd48e796a
5 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -89,7 +89,7 @@ public class EventHookContainer
if (stack != null)
{
Item item = stack.getItem();
if (item instanceof ItemDoor && !(item instanceof BaseItemDoor))
if (item instanceof ItemDoor)
{
Block doorToPlace = null;
if (stack.itemID == Item.doorIron.itemID)
@@ -105,19 +105,22 @@ public class EventHookContainer
doorToPlace = mod_pocketDim.goldenDimensionalDoor;
}
// SenseiKiwi: Why do we have a condition like this? And the event isn't cancelled if we take the else portion.
// Comments would have been very helpful.
if (mod_pocketDim.itemDimensionalDoor.tryPlacingDoor(doorToPlace, world, event.entityPlayer, stack))
if (doorToPlace != null)
{
if (!event.entityPlayer.capabilities.isCreativeMode)
// SenseiKiwi: Why do we have a condition like this? And the event isn't cancelled if we take the else portion.
// Comments would have been very helpful.
if (mod_pocketDim.itemDimensionalDoor.tryPlacingDoor(doorToPlace, world, event.entityPlayer, stack))
{
stack.stackSize--;
if (!event.entityPlayer.capabilities.isCreativeMode)
{
stack.stackSize--;
}
event.setCanceled(true);
}
else
{
BaseItemDoor.tryItemUse(doorToPlace, stack, event.entityPlayer, world, event.x, event.y, event.z, event.face, true, true);
}
event.setCanceled(true);
}
else
{
BaseItemDoor.tryItemUse(doorToPlace, stack, event.entityPlayer, world, event.x, event.y, event.z, event.face, true, true);
}
}
}
@@ -198,8 +201,7 @@ public class EventHookContainer
player.extinguish();
player.clearActivePotions();
player.setHealth(player.getMaxHealth());
ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand);
Point4D destination = new Point4D((int) (coords.posX + player.posX), coords.posY, (int) (coords.posZ + player.posZ ), mod_pocketDim.properties.LimboDimensionID);
Point4D destination = LimboProvider.getLimboSkySpawn(player, properties);
DDTeleporter.teleportEntity(player, destination, false);
}