diff --git a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index f3076a15..ea8814f1 100644 --- a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -14,6 +14,7 @@ import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.jetbrains.annotations.NotNull; @@ -41,6 +42,11 @@ public abstract class SummoningEnchantment extends EcoEnchant { return; } + if (event.getCause() == EntityDamageEvent.DamageCause.ENTITY_SWEEP_ATTACK + && this.getConfig().getBool("config.ignore-sweep-attacks")) { + return; + } + doSpawn(attacker, victim, level); } diff --git a/eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml index 9672ddc8..598cb71c 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml @@ -29,4 +29,5 @@ config: mobs-per-level: 2 # Amount of mobs to spawn per level ticks-to-live-per-level: 30 # Ticks for mob to live per level health-per-level: 6 # Health for mobs to have per level - chance-per-level: 5 # Chance to spawn mobs per level \ No newline at end of file + chance-per-level: 5 # Chance to spawn mobs per level + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file diff --git a/eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml index 2ba71fa7..c5209230 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml @@ -30,4 +30,5 @@ config: ticks-to-live-per-level: 50 # Ticks for mob to live per level health-per-level: 4 # Health for mobs to have per level chance-per-level: 5 # Chance to spawn mobs per level - allow-not-fully-charged: false # don't require sword attack to be at full charge \ No newline at end of file + allow-not-fully-charged: false # don't require sword attack to be at full charge + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file diff --git a/eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml index d635adb0..7b4cd2a7 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml @@ -30,4 +30,5 @@ config: mobs-per-level: 1 # Amount of mobs to spawn per level ticks-to-live-per-level: 30 # Ticks for mob to live per level health-per-level: 4 # Health for mobs to have per level - chance-per-level: 5 # Chance to spawn mobs per level \ No newline at end of file + chance-per-level: 5 # Chance to spawn mobs per level + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file diff --git a/eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml index 6e6668fb..9751387d 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml @@ -30,4 +30,5 @@ config: mobs-per-level: 1 # Amount of mobs to spawn per level ticks-to-live-per-level: 30 # Ticks for mob to live per level health-per-level: 6 # Health for mobs to have per level - chance-per-level: 5 # Chance to spawn mobs per level \ No newline at end of file + chance-per-level: 5 # Chance to spawn mobs per level + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file diff --git a/eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml index 35f9fc6c..691c2f8e 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml @@ -29,4 +29,5 @@ config: mobs-per-level: 2 # Amount of mobs to spawn per level ticks-to-live-per-level: 40 # Ticks for mob to live per level health-per-level: 4 # Health for mobs to have per level - chance-per-level: 5 # Chance to spawn mobs per level \ No newline at end of file + chance-per-level: 5 # Chance to spawn mobs per level + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file diff --git a/eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml b/eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml index 263508dc..1e61a176 100644 --- a/eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml +++ b/eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml @@ -30,4 +30,5 @@ config: ticks-to-live-per-level: 20 # Ticks for mob to live per level health-per-level: 4 # Health for mobs to have per level chance-per-level: 5 # Chance to spawn mobs per level - allow-not-fully-charged: false # don't require sword attack to be at full charge \ No newline at end of file + allow-not-fully-charged: false # don't require sword attack to be at full charge + ignore-sweep-attacks: true # Ignore sweep attacks \ No newline at end of file