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

removed a sided function from robot logic (annotations above comments == evil); suppressing LimitReachedException in computer callback logging

Browse Source
This commit is contained in:
Florian Nücke 2014-01-06 21:14:42 +01:00
parent 6c1a7c595e
commit 93db93ae39
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/server/component/Computer.scala
View File

@ -1004,7 +1004,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
} }
catch { catch {
case e: Throwable => case e: Throwable =>
if (Settings.get.logLuaCallbackErrors) { if (Settings.get.logLuaCallbackErrors && !e.isInstanceOf[LimitReachedException]) {
OpenComputers.log.log(Level.WARNING, "Exception in Lua callback.", e) OpenComputers.log.log(Level.WARNING, "Exception in Lua callback.", e)
} }
e match { e match {

2
li/cil/oc/server/component/Robot.scala
View File

@ -590,7 +590,7 @@ class Robot(val robot: tileentity.Robot) extends Computer(robot) with RobotConte
player.side.offsetZ * range) player.side.offsetZ * range)
val hit = world.clip(origin, target) val hit = world.clip(origin, target)
player.closestEntity[Entity]() match { player.closestEntity[Entity]() match {
case Some(entity@(_: EntityLivingBase | _: EntityMinecart)) if hit == null || player.getPosition(1).distanceTo(hit.hitVec) > player.getDistanceToEntity(entity) => new MovingObjectPosition(entity) case Some(entity@(_: EntityLivingBase | _: EntityMinecart)) if hit == null || world.getWorldVec3Pool.getVecFromPool(player.posX, player.posY, player.posZ).distanceTo(hit.hitVec) > player.getDistanceToEntity(entity) => new MovingObjectPosition(entity)
case _ => hit case _ => hit
} }
} }