Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput…

…ers into OC1.6-MC1.7.10
MightyPirates · Dec 17, 2016 · 3eb5dc4 · 3eb5dc4
2 parents e9cc754 + 94efa8d
commit 3eb5dc4
Showing 1 changed file with 2 additions and 1 deletion.
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) {