From 52a032ff63aea6ada292da1a47ec8caa958521f6 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Tue, 10 Jan 2017 14:21:03 +0100 Subject: [PATCH] Fix #2220. --- .../scala/li/cil/oc/common/nanomachines/ControllerImpl.scala | 2 +- src/main/scala/li/cil/oc/server/network/Network.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala b/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala index 843a34359..bda065e05 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala @@ -102,7 +102,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.getUnformattedTextForChat) case Array("getExperience") => respond(sender, "experience", player.experienceLevel) diff --git a/src/main/scala/li/cil/oc/server/network/Network.scala b/src/main/scala/li/cil/oc/server/network/Network.scala index 1ab00202c..82453c368 100644 --- a/src/main/scala/li/cil/oc/server/network/Network.scala +++ b/src/main/scala/li/cil/oc/server/network/Network.scala @@ -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) } -} \ No newline at end of file +}