From 8ed35aba2b1ee4c90bc40a0792ef441775cdca4e Mon Sep 17 00:00:00 2001 From: speed <43330808+speedxx@users.noreply.github.com> Date: Tue, 1 Dec 2020 18:53:28 -0500 Subject: [PATCH] add "Interaction" result action string check fixes container interactions being logged as block removals --- .../bridge/CoreProtectBridge.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java index 85201418..f53664cf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java @@ -333,10 +333,14 @@ public class CoreProtectBridge extends FreedomService { s = " placed "; } - else + else if (result.getActionString().equals("Removal")) { s = " broke "; } + else + { + s = " interacted with "; + } if (result.isRolledBack()) { @@ -365,9 +369,15 @@ public class CoreProtectBridge extends FreedomService { if (data.hasInspection()) { - BlockState placedBlock = block.getRelative(event.getBlockFace()).getState(); + BlockState blockState = block.getRelative(event.getBlockFace()).getState(); + Block placedBlock = blockState.getBlock(); event.setCancelled(true); - List lookup = coreProtect.blockLookup(placedBlock.getBlock(), -1); + List lookup = coreProtect.blockLookup(placedBlock, -1); + + if (lookup.isEmpty()) + { + lookup = coreProtect.blockLookup(block, -1); + } int cooldownTime = 3; @@ -414,10 +424,14 @@ public class CoreProtectBridge extends FreedomService { s = " placed "; } - else + else if (result.getActionString().equals("Removal")) { s = " broke "; } + else + { + s = " interacted with "; + } if (result.isRolledBack()) {