From e122f0d3d2d245f4284e8a7b1190024876ea9e15 Mon Sep 17 00:00:00 2001 From: svitoos Date: Fri, 24 May 2019 15:13:40 +0300 Subject: [PATCH] fixes issue "itemDamageRate Do not Work" #3041 --- .../scala/li/cil/oc/server/agent/Player.scala | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/scala/li/cil/oc/server/agent/Player.scala b/src/main/scala/li/cil/oc/server/agent/Player.scala index 5a5e401e2..d48bc4be1 100644 --- a/src/main/scala/li/cil/oc/server/agent/Player.scala +++ b/src/main/scala/li/cil/oc/server/agent/Player.scala @@ -633,16 +633,16 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc EventHandler.scheduleServer(() => tick()) } else { - val itemsBefore = adjacentItems - this.player.posX -= side.getFrontOffsetX / 2.0 - this.player.posZ -= side.getFrontOffsetZ / 2.0 - val expGained: Int = PlayerInteractionManagerHelper.blockRemoving(player, pos) - this.player.posX += side.getFrontOffsetX / 2.0 - this.player.posZ += side.getFrontOffsetZ / 2.0 - if (expGained >= 0) { - MinecraftForge.EVENT_BUS.post(new RobotBreakBlockEvent.Post(agent, expGained)) - collectDroppedItems(itemsBefore) - } + callUsingItemInSlot(player.agent.equipmentInventory(), 0, _ => { + this.player.posX -= side.getFrontOffsetX / 2.0 + this.player.posZ -= side.getFrontOffsetZ / 2.0 + val expGained: Int = PlayerInteractionManagerHelper.blockRemoving(player, pos) + this.player.posX += side.getFrontOffsetX / 2.0 + this.player.posZ += side.getFrontOffsetZ / 2.0 + if (expGained >= 0) { + MinecraftForge.EVENT_BUS.post(new RobotBreakBlockEvent.Post(agent, expGained)) + } + }) } } }