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

This commit is contained in:
Florian Nücke 2014-07-09 18:20:05 +02:00
commit 1df13cc8d6

View File

@ -414,7 +414,7 @@ class NativeLuaArchitecture(val machine: api.machine.Machine) extends Architectu
OpenComputers.log.warn("Could not persist computer.\n" + e.toString + (if (e.getLuaStackTrace.isEmpty) "" else "\tat " + e.getLuaStackTrace.mkString("\n\tat "))) OpenComputers.log.warn("Could not persist computer.\n" + e.toString + (if (e.getLuaStackTrace.isEmpty) "" else "\tat " + e.getLuaStackTrace.mkString("\n\tat ")))
nbt.removeTag("state") nbt.removeTag("state")
case e: LuaGcMetamethodException => case e: LuaGcMetamethodException =>
OpenComputers.log.warning("Could not persist computer.\n" + e.toString) OpenComputers.log.warn("Could not persist computer.\n" + e.toString)
nbt.removeTag("state") nbt.removeTag("state")
} }