AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 12:17:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes disconnects when waila is installed on server and client

Browse Source
This commit is contained in:
Florian Nücke 2014-01-23 22:46:41 +01:00
parent cc98b71884
commit 0d5a1af825
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/common/tileentity/Computer.scala
View File

@ -131,8 +131,10 @@ abstract class Computer(isRemote: Boolean) extends Environment with ComponentInv
override def writeToNBT(nbt: NBTTagCompound) { override def writeToNBT(nbt: NBTTagCompound) {
super.writeToNBT(nbt) super.writeToNBT(nbt)
if (!new Exception().getStackTrace.exists(_.getClassName.startsWith("mcp.mobius.waila"))) {
nbt.setNewCompoundTag(Settings.namespace + "computer", computer.save) nbt.setNewCompoundTag(Settings.namespace + "computer", computer.save)
} }
}
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
override def readFromNBTForClient(nbt: NBTTagCompound) { override def readFromNBTForClient(nbt: NBTTagCompound) {

2
li/cil/oc/common/tileentity/Rack.scala
View File

@ -189,6 +189,7 @@ class Rack extends Hub with PowerBalancer with Inventory with Rotatable with Bun
} }
override def writeToNBT(nbt: NBTTagCompound) { override def writeToNBT(nbt: NBTTagCompound) {
if (!new Exception().getStackTrace.exists(_.getClassName.startsWith("mcp.mobius.waila"))) {
nbt.setNewTagList(Settings.namespace + "servers", servers map { nbt.setNewTagList(Settings.namespace + "servers", servers map {
case Some(server) => case Some(server) =>
val serverNbt = new NBTTagCompound() val serverNbt = new NBTTagCompound()
@ -196,6 +197,7 @@ class Rack extends Hub with PowerBalancer with Inventory with Rotatable with Bun
serverNbt serverNbt
case _ => new NBTTagCompound() case _ => new NBTTagCompound()
}) })
}
super.writeToNBT(nbt) super.writeToNBT(nbt)
nbt.setByteArray(Settings.namespace + "sides", sides.map(_.ordinal.toByte)) nbt.setByteArray(Settings.namespace + "sides", sides.map(_.ordinal.toByte))
nbt.setNewTagList(Settings.namespace + "terminals", terminals.map(t => { nbt.setNewTagList(Settings.namespace + "terminals", terminals.map(t => {