From 973279cdb7e73d2703028d20a630b31bbdbddfd6 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 26 Aug 2020 10:26:50 -0700 Subject: [PATCH] Revert listener behaviour for PlayerInteractEvent --- Changelog.txt | 4 ++++ pom.xml | 2 +- src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index babb16d7a..f93ac739b 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,7 @@ +Version 2.1.145 + Reverted 'Changed one of the PlayerInteractEvent listeners to ignore cancelled events' from 2.1.144 + + Version 2.1.144 Steel Arm Style damage is now customizable in advanced.yml (make sure to set override to true) Fixed a bug where Deflect worked against non-arrow projectiles diff --git a/pom.xml b/pom.xml index f5db27015..adb49825d 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.144 + 2.1.145-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 476c75ec4..a4212838c 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -711,7 +711,7 @@ public class PlayerListener implements Listener { * * @param event The event to monitor */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.MONITOR) public void onPlayerInteractMonitor(PlayerInteractEvent event) { /* WORLD BLACKLIST CHECK */ if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))