AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 07:25:35 -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 09:32:56 +01:00
commit 61a2ceaf3d
2 changed files with 1 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/server/component/machine/NativeLuaArchitecture.scala
View File

@ -7,12 +7,10 @@ import java.util.logging.Level
import li.cil.oc.api.machine.{Architecture, LimitReachedException, ExecutionResult} import li.cil.oc.api.machine.{Architecture, LimitReachedException, ExecutionResult}
import li.cil.oc.api.network.ComponentConnector import li.cil.oc.api.network.ComponentConnector
import li.cil.oc.common.SaveHandler import li.cil.oc.common.SaveHandler
import li.cil.oc.server.component
import li.cil.oc.util.ExtendedLuaState.extendLuaState import li.cil.oc.util.ExtendedLuaState.extendLuaState
import li.cil.oc.util.{GameTimeFormatter, LuaStateFactory} import li.cil.oc.util.{GameTimeFormatter, LuaStateFactory}
import li.cil.oc.{api, OpenComputers, server, Settings} import li.cil.oc.{api, OpenComputers, server, Settings}
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
import net.minecraft.world.ChunkCoordIntPair import net.minecraft.world.ChunkCoordIntPair
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
import scala.collection.mutable import scala.collection.mutable

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.intValue case value: java.lang.Double => value.longValue.intValue
case value => throw typeError(index, value, "number") case value => throw typeError(index, value, "number")
} }
} }