From 93db93ae3965a37d91a2630b5ce2740171a71b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 6 Jan 2014 21:14:42 +0100 Subject: [PATCH] removed a sided function from robot logic (annotations above comments == evil); suppressing LimitReachedException in computer callback logging --- li/cil/oc/server/component/Computer.scala | 2 +- li/cil/oc/server/component/Robot.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/li/cil/oc/server/component/Computer.scala b/li/cil/oc/server/component/Computer.scala index 0b9cbfd1f..9a9ee05b0 100644 --- a/li/cil/oc/server/component/Computer.scala +++ b/li/cil/oc/server/component/Computer.scala @@ -1004,7 +1004,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con } catch { case e: Throwable => - if (Settings.get.logLuaCallbackErrors) { + if (Settings.get.logLuaCallbackErrors && !e.isInstanceOf[LimitReachedException]) { OpenComputers.log.log(Level.WARNING, "Exception in Lua callback.", e) } e match { diff --git a/li/cil/oc/server/component/Robot.scala b/li/cil/oc/server/component/Robot.scala index 7dfbb523c..f5a87e00f 100644 --- a/li/cil/oc/server/component/Robot.scala +++ b/li/cil/oc/server/component/Robot.scala @@ -590,7 +590,7 @@ class Robot(val robot: tileentity.Robot) extends Computer(robot) with RobotConte player.side.offsetZ * range) val hit = world.clip(origin, target) 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 } }