Merge branch 'master' of https://github.com/TownyAdvanced/TownyCombat…

….git
TownyAdvanced · Jan 13, 2024 · 25f06b9 · 25f06b9
2 parents 980984f + 8d6f1f6
commit 25f06b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...in/java/io/github/townyadvanced/townycombat/listeners/TownyCombatBukkitEventListener.java b/...in/java/io/github/townyadvanced/townycombat/listeners/TownyCombatBukkitEventListener.java
@@ -55,7 +55,7 @@ public TownyCombatBukkitEventListener(TownyCombat instance) {
 		plugin = instance;
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (PlayerTeleportEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -73,7 +73,7 @@ public void on (PlayerTeleportEvent event) {
 			TownyCombatHorseUtil.scheduleMountTeleport(event);
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (EntityMountEvent event) {
 		if(!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -110,7 +110,7 @@ public void on (EntityMountEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (EntityDismountEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -120,7 +120,7 @@ public void on (EntityDismountEvent event) {
 		TownyCombatHorseUtil.deregisterPlayerForCavalryStrengthBonus((Player)event.getEntity());
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (PlayerJoinEvent event) {
 		if(!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -145,7 +145,7 @@ public void on (PlayerJoinEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (EntityDamageEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -165,7 +165,7 @@ public void on (EntityDamageEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (PotionSplashEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -183,7 +183,7 @@ public void on (PotionSplashEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (EntityShootBowEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -202,7 +202,7 @@ public void on (EntityShootBowEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (EntityDamageByEntityEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -345,7 +345,7 @@ public void on (EntityDamageByEntityEvent event) {
 		event.setDamage(damage);
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (PrepareItemCraftEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -368,7 +368,7 @@ public void on (PrepareItemCraftEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (BrewEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;
@@ -424,7 +424,7 @@ public void on (InventoryCloseEvent event) {
 		}
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on (PlayerItemConsumeEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;

diff --git a/...in/java/io/github/townyadvanced/townycombat/listeners/TownyCombatNationEventListener.java b/...in/java/io/github/townyadvanced/townycombat/listeners/TownyCombatNationEventListener.java
@@ -22,7 +22,7 @@ public TownyCombatNationEventListener(TownyCombat instance) {
 		plugin = instance;
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on(NationSpawnEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;

diff --git a/...main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownEventListener.java b/...main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownEventListener.java
@@ -22,7 +22,7 @@ public TownyCombatTownEventListener(TownyCombat instance) {
 		plugin = instance;
 	}
 
-	@EventHandler
+	@EventHandler (ignoreCancelled = true)
 	public void on(TownSpawnEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())
 			return;