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

This commit is contained in:
Florian Nücke 2014-10-05 15:04:00 +02:00
commit bc842a150b

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
// ----------------------------------------------------------------------- //