minor adjustments

xGinko · Nov 13, 2023 · 0494e56 · 0494e56
1 parent 0987233
commit 0494e56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/me/xginko/pumpkinpvpreloaded/modules/mechanics/RateLimitPumpkinExplosions.java b/src/main/java/me/xginko/pumpkinpvpreloaded/modules/mechanics/RateLimitPumpkinExplosions.java
@@ -51,8 +51,8 @@ private void onPrePumpkinExplode(PrePumpkinExplodeEvent event) {
         if (this.players_on_cooldown.getIfPresent(exploderUniqueId) == null) {
             this.players_on_cooldown.put(exploderUniqueId, true);
         } else {
-            event.setCancelled(true);
             event.setPrecedingCancelled(true);
+            event.setCancelled(true);
         }
     }
 }
diff --git a/src/main/java/me/xginko/pumpkinpvpreloaded/modules/triggers/ExplodePumpkinOnRightClick.java b/src/main/java/me/xginko/pumpkinpvpreloaded/modules/triggers/ExplodePumpkinOnRightClick.java
@@ -46,7 +46,7 @@ public void disable() {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    private void onBlockLeftClick(PlayerInteractEvent event) {
+    private void onBlockRightClick(PlayerInteractEvent event) {
         if (!event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) return;
 
         final Block clicked = event.getClickedBlock();

diff --git a/src/main/java/me/xginko/pumpkinpvpreloaded/modules/triggers/ExplodePumpkinOnShear.java b/src/main/java/me/xginko/pumpkinpvpreloaded/modules/triggers/ExplodePumpkinOnShear.java
@@ -55,7 +55,7 @@ public void disable() {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    private void onBlockLeftClick(PlayerInteractEvent event) {
+    private void onBlockRightClick(PlayerInteractEvent event) {
         if (!event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) return;
 
         final Block clicked = event.getClickedBlock();