Revert "Bump version number & small NPE fix."

This reverts commit 8a053117c6.

# Conflicts:
#	build.gradle
This commit is contained in:
modmuss50 2016-08-10 00:32:43 +01:00
parent e3384e3266
commit 9b882e75ce

View file

@ -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;
}