Bump version number & small NPE fix.
This commit is contained in:
parent
b292fdd352
commit
8a053117c6
2 changed files with 16 additions and 14 deletions
|
@ -64,7 +64,7 @@ configurations {
|
|||
}
|
||||
|
||||
|
||||
version = "1.3.4"
|
||||
version = "1.3.5"
|
||||
|
||||
def ENV = System.getenv()
|
||||
if (ENV.BUILD_NUMBER) {
|
||||
|
|
|
@ -138,20 +138,22 @@ public class EnergyUtils {
|
|||
|
||||
public static PowerNetReceiver getReceiver(World world, EnumFacing side, BlockPos pos) {
|
||||
TileEntity tileEntity = world.getTileEntity(pos);
|
||||
if (Loader.isModLoaded("IC2") && RebornCoreConfig.getRebornPower().eu()) {
|
||||
PowerNetReceiver ic2receiver = getIC2Receiver(tileEntity, side);
|
||||
if (ic2receiver != null) return ic2receiver;
|
||||
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("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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue