Merge pull request #5 from the-h-team/master

Test with ignoreCancelled = true
Hempfest · May 15, 2021 · 0aa2e53 · 0aa2e53
2 parents 0ca2b5f + 8fa5ff7
commit 0aa2e53
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/youtube/hempfest/clans/util/listener/PlayerEventListener.java b/src/main/java/com/youtube/hempfest/clans/util/listener/PlayerEventListener.java
@@ -166,20 +166,20 @@ public void onPlayerDeath(PlayerDeathEvent event) {
 		}
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onBucketRelease(PlayerBucketEmptyEvent event) {
 		ClaimInteractEvent e = new ClaimInteractEvent(event.getPlayer(), event.getBlock().getLocation());
 		Bukkit.getPluginManager().callEvent(e);
 		e.handleCheck();
-		event.setCancelled(e.isCancelled());
+		if (e.isCancelled()) event.setCancelled(true);
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onBucketFill(PlayerBucketFillEvent event) {
 		ClaimInteractEvent e = new ClaimInteractEvent(event.getPlayer(), event.getBlock().getLocation());
 		Bukkit.getPluginManager().callEvent(e);
 		e.handleCheck();
-		event.setCancelled(e.isCancelled());
+		if (e.isCancelled()) event.setCancelled(true);
 	}
 
 	@EventHandler(priority = EventPriority.NORMAL)