From 9b882e75ce08115e3c37549da2f0a616325614cc Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 10 Aug 2016 00:32:43 +0100 Subject: [PATCH] Revert "Bump version number & small NPE fix." This reverts commit 8a053117c67b0ce09eaf4b6d9748fdf5dc060633. # Conflicts: # build.gradle --- .../java/techreborn/power/EnergyUtils.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/techreborn/power/EnergyUtils.java b/src/main/java/techreborn/power/EnergyUtils.java index b62d3a061..35906ffee 100644 --- a/src/main/java/techreborn/power/EnergyUtils.java +++ b/src/main/java/techreborn/power/EnergyUtils.java @@ -138,22 +138,20 @@ public class EnergyUtils { public static PowerNetReceiver getReceiver(World world, EnumFacing side, BlockPos pos) { TileEntity tileEntity = world.getTileEntity(pos); - if(tileEntity != null) { - if (Loader.isModLoaded("IC2") && RebornCoreConfig.getRebornPower().eu()) { - PowerNetReceiver ic2receiver = getIC2Receiver(tileEntity, side); - if (ic2receiver != null) return ic2receiver; - } - if (Loader.isModLoaded("Tesla") && RebornCoreConfig.getRebornPower().tesla()) { - PowerNetReceiver teslaReceiver = getTeslaReceiver(tileEntity, side); - if (teslaReceiver != null) return teslaReceiver; - } - if (RebornCoreConfig.getRebornPower().rf()) { - PowerNetReceiver rfReceiver = getRFReceiver(tileEntity, side); - if (rfReceiver != null) return rfReceiver; - } - PowerNetReceiver internalReceiver = getInternalReceiver(tileEntity, side); - if (internalReceiver != null) return internalReceiver; + if (Loader.isModLoaded("IC2") && RebornCoreConfig.getRebornPower().eu()) { + PowerNetReceiver ic2receiver = getIC2Receiver(tileEntity, side); + if (ic2receiver != null) return ic2receiver; } + if (Loader.isModLoaded("Tesla") && RebornCoreConfig.getRebornPower().tesla()) { + PowerNetReceiver teslaReceiver = getTeslaReceiver(tileEntity, side); + if (teslaReceiver != null) return teslaReceiver; + } + if (RebornCoreConfig.getRebornPower().rf()) { + PowerNetReceiver rfReceiver = getRFReceiver(tileEntity, side); + if (rfReceiver != null) return rfReceiver; + } + PowerNetReceiver internalReceiver = getInternalReceiver(tileEntity, side); + if (internalReceiver != null) return internalReceiver; return null; }