diff --git a/README.md b/README.md index 1b76dfd..22313b4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ How to include WorldEditWrapper into your maven project: org.codemc.worldguardwrapper worldguardwrapper - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT ``` diff --git a/api/pom.xml b/api/pom.xml index fd024e0..27202ad 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper-api diff --git a/implementation/interface/pom.xml b/implementation/interface/pom.xml index 8740307..68fff12 100644 --- a/implementation/interface/pom.xml +++ b/implementation/interface/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper-implementation-interface @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-api - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT diff --git a/implementation/pom.xml b/implementation/pom.xml index 02cc676..4fffc8a 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper-implementation diff --git a/implementation/v6/pom.xml b/implementation/v6/pom.xml index b41157b..9488d7d 100644 --- a/implementation/v6/pom.xml +++ b/implementation/v6/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper-implementation-v6 @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-implementation-interface - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT com.sk89q.worldguard 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 dda0eca..04841da 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 org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.Event.Result; import org.codemc.worldguardwrapper.event.AbstractWrappedEvent; @NoArgsConstructor @@ -27,7 +28,12 @@ public class EventListener implements Listener { worldGuardEvent.getBlocks(), worldGuardEvent.getEffectiveMaterial()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } @EventHandler @@ -44,7 +50,12 @@ public class EventListener implements Listener { worldGuardEvent.getTarget(), worldGuardEvent.getEntity()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } @EventHandler @@ -61,7 +72,12 @@ public class EventListener implements Listener { worldGuardEvent.getTarget(), worldGuardEvent.getEntity()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } } diff --git a/implementation/v7/pom.xml b/implementation/v7/pom.xml index 513b042..318c220 100644 --- a/implementation/v7/pom.xml +++ b/implementation/v7/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-implementation - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper-implementation-v7 @@ -18,7 +18,7 @@ ${project.groupId} worldguardwrapper-implementation-interface - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT com.sk89q.worldguard 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 7674333..5343efa 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 @@ -8,6 +8,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.Event.Result; import org.codemc.worldguardwrapper.event.AbstractWrappedEvent; @NoArgsConstructor @@ -27,7 +28,12 @@ public class EventListener implements Listener { worldGuardEvent.getBlocks(), worldGuardEvent.getEffectiveMaterial()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } @EventHandler @@ -44,7 +50,12 @@ public class EventListener implements Listener { worldGuardEvent.getTarget(), worldGuardEvent.getEntity()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } @EventHandler @@ -61,7 +72,12 @@ public class EventListener implements Listener { worldGuardEvent.getTarget(), worldGuardEvent.getEntity()); Bukkit.getServer().getPluginManager().callEvent(event); - worldGuardEvent.setResult(event.getResult()); + + if (event.getResult() != Result.DEFAULT) { + // DEFAULT = Result probably has not been touched by the handler, + // so don't touch the original result either. + worldGuardEvent.setResult(event.getResult()); + } } } diff --git a/library/pom.xml b/library/pom.xml index 4c5cf97..42b68a5 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -7,7 +7,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT worldguardwrapper @@ -18,13 +18,13 @@ ${project.groupId} worldguardwrapper-implementation-v6 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT true ${project.groupId} worldguardwrapper-implementation-v7 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT true diff --git a/pom.xml b/pom.xml index cce1314..8bd3db7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.codemc.worldguardwrapper worldguardwrapper-parent - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT pom