diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 31fd6a7f..206e671b 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -287,8 +287,7 @@ public class TravelController { } TileEnderIO eio = (TileEnderIO) te; if(eio.canBlockBeAccessed(player)) { - - int requiredPower = ItemTravelStaff.isEquipped(player) ? TravelController.instance.getRequiredPower(player, TravelSource.STAFF, target) : 0; + int requiredPower = equipped == null ? 0 : instance.getRequiredPower(player, TravelSource.STAFF, target); if(requiredPower <= 0 || requiredPower <= getEnergyInTravelItem(equipped)) { if(requiredPower > 0) { PacketDrainStaff p = new PacketDrainStaff(requiredPower); @@ -594,4 +593,4 @@ public class TravelController { return null; } -} \ No newline at end of file +}