From f6ad7a79e28189ec1c5a8bb5f6cf274d7f139a96 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 19 Jun 2015 21:42:19 +0100 Subject: [PATCH] Set the cached coordinates on SubTile NBT read to null if TAG_POOL_Y is -1. --- .../java/vazkii/botania/api/subtile/SubTileFunctional.java | 2 +- .../java/vazkii/botania/api/subtile/SubTileGenerating.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 4b7b59bf6..1459d90d7 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -155,7 +155,7 @@ public class SubTileFunctional extends SubTileEntity { int y = cmp.getInteger(TAG_POOL_Y); int z = cmp.getInteger(TAG_POOL_Z); - cachedPoolCoordinates = new ChunkCoordinates(x, y, z); + cachedPoolCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 5599bf85e..170b8f871 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -177,14 +177,12 @@ public class SubTileGenerating extends SubTileEntity { @Override public void readFromPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); - if(!cmp.hasKey(TAG_TICKS_EXISTED)) - ticksExisted = cmp.getInteger(TAG_TICKS_EXISTED); int x = cmp.getInteger(TAG_COLLECTOR_X); int y = cmp.getInteger(TAG_COLLECTOR_Y); int z = cmp.getInteger(TAG_COLLECTOR_Z); - cachedCollectorCoordinates = new ChunkCoordinates(x, y, z); + cachedCollectorCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); } @Override