From 10f2b5163c09481c038cc22507ea3317e8de773a Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 29 Dec 2016 17:07:59 +1000 Subject: % Small change to Multitank logic. ^ Version bump to V1.4.9.22-alpha + Uploaded PlayerAPI-1.7.10-1.4.jar library file. https://minecraft.curseforge.com/projects/player-api/files/2248928 --- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- .../machines/multi/GregtechMetaTileEntity_MultiTank.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index e87be5a031..7b1a1fe86e 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -18,7 +18,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.9.15-release"; + public static final String VERSION = "1.4.9.22-alpha"; public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static boolean isModUpToDate = Utils.isModUpToDate(); public static boolean DEBUG = false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java index a1140f3777..e83e819207 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java @@ -412,9 +412,16 @@ extends GregtechMeta_MultiBlockBase { } public int countCasings() { + try{ if (this.getBaseMetaTileEntity().getWorld() == null){ return 0; - } + } + if (this.getBaseMetaTileEntity() == null){ + return 0; + } + } catch(NullPointerException r){ + return 0; + } int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX; int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ; if (!this.getBaseMetaTileEntity().getAirOffset(xDir, 0, zDir)) { -- cgit