From 3b5bb9487b2d72d8ed9552eda829a6ffbf7f8178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 18 Mar 2014 14:05:58 +0100 Subject: [PATCH] undid the Arguments.checkInteger change since it can break things (and did!), checking for actual int byte mask in hologram manually now --- src/main/scala/li/cil/oc/common/tileentity/Hologram.scala | 2 +- src/main/scala/li/cil/oc/server/network/Component.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala index a778f82ee..aaf0f6f43 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Hologram.scala @@ -94,7 +94,7 @@ class Hologram extends Environment with SidedEnvironment with Analyzable { if (x < 0 || x >= width) throw new ArrayIndexOutOfBoundsException() val z = args.checkInteger(1) - 1 if (z < 0 || z >= width) throw new ArrayIndexOutOfBoundsException() - val value = args.checkInteger(2) + val value = args.checkDouble(2).longValue.intValue volume(x + z * width) = value setDirty(x, z) null diff --git a/src/main/scala/li/cil/oc/server/network/Component.scala b/src/main/scala/li/cil/oc/server/network/Component.scala index f50cd5099..d78d1a6ae 100644 --- a/src/main/scala/li/cil/oc/server/network/Component.scala +++ b/src/main/scala/li/cil/oc/server/network/Component.scala @@ -259,7 +259,7 @@ object Component { def checkInteger(index: Int) = { checkIndex(index, "number") args(index) match { - case value: java.lang.Double => value.longValue.intValue + case value: java.lang.Double => value.intValue case value => throw typeError(index, value, "number") } }