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

Merge branch 'master-MC1.8.9' into master-MC1.9.4

Browse Source
This commit is contained in:
Vexatos 2017-01-10 14:21:43 +01:00
commit 19933fb7bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala
View File

@ -103,7 +103,7 @@ class ControllerImpl(val player: EntityPlayer) extends Controller with WirelessE
case Array("getAge") =>
respond(sender, "age", (player.getAge / 20f).toInt)
case Array("getName") =>
respond(sender, "name", player.getDisplayName)
respond(sender, "name", player.getDisplayName.getUnformattedComponentText)
case Array("getExperience") =>
respond(sender, "experience", player.experienceLevel)

4
src/main/scala/li/cil/oc/server/network/Network.scala
View File

@ -702,7 +702,7 @@ object Network extends api.detail.NetworkAPI {
case _: java.lang.Double => 8
case value: java.lang.String => value.length max 1
case value: Array[Byte] => value.length max 1
case _ => throw new IllegalArgumentException("unsupported data type")
case value => throw new IllegalArgumentException(s"unsupported data type: $value (${value.getClass.getCanonicalName})")
})
})
})
@ -777,4 +777,4 @@ object Network extends api.detail.NetworkAPI {
def changeBuffer(delta: Double) = network.changeBuffer(delta)
}
}
}