diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-12-29 17:07:59 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-12-29 17:07:59 +1000 |
| commit | 10f2b5163c09481c038cc22507ea3317e8de773a (patch) | |
| tree | 6dd363c12b0f2c2ccf9923dffc3b38c4e1eb479b | |
| parent | c818088eb463b7e93357bef0bdc756863f206cc1 (diff) | |
| download | GT5-Unofficial-10f2b5163c09481c038cc22507ea3317e8de773a.tar.gz GT5-Unofficial-10f2b5163c09481c038cc22507ea3317e8de773a.tar.bz2 GT5-Unofficial-10f2b5163c09481c038cc22507ea3317e8de773a.zip | |
% 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
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java | 9 | ||||
| -rw-r--r-- | src/resources/mcmod.info | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index bd2c17eed5..7786233d86 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT-PlusPlus" -version = "1.4.9.15-release" +version = "1.4.9.22-alpha" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { 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)) { diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 11ce78f419..00ad9a741c 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.4.9.15-release", + "version": "1.4.9.22-alpha", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", |