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

fnuecke · fnuecke · commit 3eb5dc4710ad · 2016-12-17T23:50:29.000+01:00
diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/OpenSides.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/OpenSides.scala
@@ -27,7 +27,8 @@ trait OpenSides extends TileEntity {
 
   override def readFromNBTForServer(nbt: NBTTagCompound) {
     super.readFromNBTForServer(nbt)
-    openSides = uncompressSides(nbt.getByte(Settings.namespace + "openSides"))
+    if (nbt.hasKey(Settings.namespace + "openSides"))
+      openSides = uncompressSides(nbt.getByte(Settings.namespace + "openSides"))
   }
 
   override def writeToNBTForServer(nbt: NBTTagCompound) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ trait OpenSides extends TileEntity {`
`27`	`27`
`28`	`28`	`override def readFromNBTForServer(nbt: NBTTagCompound) {`
`29`	`29`	`super.readFromNBTForServer(nbt)`
`30`		`- openSides = uncompressSides(nbt.getByte(Settings.namespace + "openSides"))`
	`30`	`+ if (nbt.hasKey(Settings.namespace + "openSides"))`
	`31`	`+ openSides = uncompressSides(nbt.getByte(Settings.namespace + "openSides"))`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`override def writeToNBTForServer(nbt: NBTTagCompound) {`