diff --git a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatBukkitEventListener.java b/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatBukkitEventListener.java index aa09a27..373c5fc 100644 --- a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatBukkitEventListener.java +++ b/src/main/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/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatNationEventListener.java b/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatNationEventListener.java index d589b7f..85f451d 100644 --- a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatNationEventListener.java +++ b/src/main/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/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownEventListener.java b/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownEventListener.java index 169246d..6bd0aff 100644 --- a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownEventListener.java +++ b/src/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;