From 4fc6f99686e6b0c7472e53330425704355904ca5 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 4 Nov 2018 14:04:01 +0100 Subject: [PATCH] Set event priority to low Events should be handled before WorldGuard does (with normal priority), so they can be allowed without WG sending a message to the player. --- .../implementation/v6/EventListener.java | 9 +++++---- .../implementation/v7/EventListener.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/EventListener.java b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/EventListener.java index 7af62b1..40aa4f9 100644 --- a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/EventListener.java +++ b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/EventListener.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.Event.Result; import org.codemc.worldguardwrapper.event.AbstractWrappedEvent; @@ -15,7 +16,7 @@ import org.codemc.worldguardwrapper.event.AbstractWrappedEvent; @NoArgsConstructor public class EventListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onUseBlock(UseBlockEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -37,7 +38,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onUseEntity(UseEntityEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -59,7 +60,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onDamageEntity(DamageEntityEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -81,7 +82,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onDisallowedPVP(DisallowedPVPEvent worldGuardEvent) { AbstractWrappedEvent event = new org.codemc.worldguardwrapper.event.DisallowedPVPEvent( worldGuardEvent.getAttacker(), diff --git a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/EventListener.java b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/EventListener.java index 6c1fda4..9da9cba 100644 --- a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/EventListener.java +++ b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/EventListener.java @@ -9,13 +9,14 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Event.Result; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.codemc.worldguardwrapper.event.AbstractWrappedEvent; @NoArgsConstructor public class EventListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onUseBlock(UseBlockEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -37,7 +38,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onUseEntity(UseEntityEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -59,7 +60,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onDamageEntity(DamageEntityEvent worldGuardEvent) { Player player = worldGuardEvent.getCause().getFirstPlayer(); if (player == null) { @@ -81,7 +82,7 @@ public class EventListener implements Listener { } } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void onDisallowedPVP(DisallowedPVPEvent worldGuardEvent) { AbstractWrappedEvent event = new org.codemc.worldguardwrapper.event.DisallowedPVPEvent( worldGuardEvent.getAttacker(),