Port NPE fix on Ender IO open from master

This commit is contained in:
tterrag1098 committed 2014-09-11 21:02:50 -04:00
1 parent 187d0bfd20
commit 2f7e936559
1 file changed
+2 -3
@@ -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;
}
}
}