Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2014-10-05 15:03:32 +02:00
commit 28950dd5f4

View File

@ -19,9 +19,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
// ----------------------------------------------------------------------- //