From bfa8914ab5208dee8374208f18d58f9ef371b895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 5 Oct 2014 15:02:57 +0200
Subject: [PATCH] Fixed side check in tile entities failing in rare cases.
 Closes #590.

---
 .../scala/li/cil/oc/common/tileentity/traits/TileEntity.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
index 8c827c463..b0477c8f0 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
@@ -21,9 +21,9 @@ trait TileEntity extends net.minecraft.tileentity.TileEntity {
 
   def block = getBlockType
 
-  def isClient = SideTracker.isClient
+  def isClient = !isServer
 
-  def isServer = SideTracker.isServer
+  def isServer = if (world != null) !world.isRemote else SideTracker.isServer
 
   // ----------------------------------------------------------------------- //