From a5b6e3fec3796fc8b1a0eb35bea9cbde23c7d91d Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 10 Oct 2018 00:38:26 -0700 Subject: [PATCH] honor enableNanomachinePfx when false also the distance check for nanomachine wireless comm was perhaps not as intended. this change increases the range by correctly computing the distance closes #2505 --- .../scala/li/cil/oc/common/nanomachines/ControllerImpl.scala | 2 +- .../li/cil/oc/common/nanomachines/provider/PotionProvider.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala b/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala index 4d8c7ced8..bb8d53c99 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala @@ -65,7 +65,7 @@ class ControllerImpl(val player: EntityPlayer) extends Controller with WirelessE override def receivePacket(packet: Packet, sender: WirelessEndpoint): Unit = { if (getLocalBuffer > 0 && commandDelay < 1 && !player.isDead) { val (dx, dy, dz) = ((sender.x + 0.5) - player.posX, (sender.y + 0.5) - player.posY, (sender.z + 0.5) - player.posZ) - val dSquared = dx * dx + dy * dy + dz * dz + val dSquared = Math.sqrt(dx * dx + dy * dy + dz * dz) if (dSquared <= CommandRange) packet.data.headOption match { case Some(header: Array[Byte]) if new String(header, Charsets.UTF_8) == "nanomachines" => val command = packet.data.drop(1).map { diff --git a/src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala b/src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala index 2b1667988..17ed4d503 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala @@ -57,7 +57,7 @@ object PotionProvider extends ScalaProvider("c29e4eec-5a46-479a-9b3d-ad0f06da784 } override def update(): Unit = { - player.addPotionEffect(new PotionEffect(potion.id, Duration, amplifier(player))) + player.addPotionEffect(new PotionEffect(potion.id, Duration, if (Settings.get.enableNanomachinePfx) amplifier(player) else -1)) } }