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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-03-18 14:06:19 +01:00
commit c8fa07c2b9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
View File

@ -94,7 +94,7 @@ class Hologram extends Environment with SidedEnvironment with Analyzable {
if (x < 0 || x >= width) throw new ArrayIndexOutOfBoundsException() if (x < 0 || x >= width) throw new ArrayIndexOutOfBoundsException()
val z = args.checkInteger(1) - 1 val z = args.checkInteger(1) - 1
if (z < 0 || z >= width) throw new ArrayIndexOutOfBoundsException() 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 volume(x + z * width) = value
setDirty(x, z) setDirty(x, z)
null null

2
src/main/scala/li/cil/oc/server/network/Component.scala
View File

@ -259,7 +259,7 @@ object Component {
def checkInteger(index: Int) = { def checkInteger(index: Int) = {
checkIndex(index, "number") checkIndex(index, "number")
args(index) match { 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") case value => throw typeError(index, value, "number")
} }
} }