From 4e38b42796db5c663e785baee3913cf2861deb13 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 12 May 2014 20:01:29 +0200 Subject: [PATCH] Fixed orphan detection. --- .../java/mcp/mobius/opis/data/managers/TileEntityManager.java | 2 +- src/main/java/mcp/mobius/opis/helpers/Helpers.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java index 8da8e83..04b668c 100644 --- a/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/src/main/java/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -135,7 +135,7 @@ public enum TileEntityManager { Block block = world.getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); if (block == Blocks.air || block == null - || block.hasTileEntity() + || !block.hasTileEntity() || world.getTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord) == null || world.getTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord).getClass() != tileEntity.getClass()){ diff --git a/src/main/java/mcp/mobius/opis/helpers/Helpers.java b/src/main/java/mcp/mobius/opis/helpers/Helpers.java index b43a792..d74bded 100644 --- a/src/main/java/mcp/mobius/opis/helpers/Helpers.java +++ b/src/main/java/mcp/mobius/opis/helpers/Helpers.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; public class Helpers { public static Side getEffectiveSide(){ Thread thr = Thread.currentThread(); + if ((thr.getName().equals("Server thread")) || (thr.getName().contains("Netty IO"))) { return Side.SERVER;