From 0bdcea8e3cb72905fa63ee58d8134a1d01262205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 16 May 2014 14:17:04 +0200 Subject: [PATCH] Fixed potential NPE. Bump version. --- build.properties | 2 +- .../scala/li/cil/oc/server/component/machine/Machine.scala | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 3d10295ee..ef22eef88 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.6.4 forge.version=9.11.1.964 -oc.version=1.2.9 +oc.version=1.2.10 ccl.version=1.0.0.62 fmp.version=1.0.0.250 maven.url=file:///var/www/users/fnuecke/maven.cil.li \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala index 6b3e5a695..507678174 100644 --- a/src/main/scala/li/cil/oc/server/component/machine/Machine.scala +++ b/src/main/scala/li/cil/oc/server/component/machine/Machine.scala @@ -191,6 +191,10 @@ class Machine(val owner: Owner, val rom: Option[ManagedEnvironment], constructor case Machine.State.Stopped | Machine.State.Stopping => false case _ => signals.synchronized { if (signals.size >= 256) false + else if (args == null) { + signals.enqueue(new Machine.Signal(name, Array.empty)) + true + } else { signals.enqueue(new Machine.Signal(name, args.map { case null | Unit | None => null