From ce959a05c72c113e312e32e842703545db116649 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 20 Feb 2021 12:03:06 +0000 Subject: [PATCH] Reworked drop system --- .../illusioner/listeners/DeathListeners.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/listeners/DeathListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/listeners/DeathListeners.java index 4b564c1..95b21be 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/listeners/DeathListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/listeners/DeathListeners.java @@ -9,7 +9,9 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDeathEvent; import org.jetbrains.annotations.NotNull; public class DeathListeners implements Listener { @@ -43,16 +45,11 @@ public class DeathListeners implements Listener { } } } + } - if (player != null) { - new DropQueue(player) - .addItems(IllusionerManager.OPTIONS.getDrops()) - .addXP(IllusionerManager.OPTIONS.generateXp()) - .setLocation(event.getVictim().getLocation()) - .push(); - } - - - event.getDeathEvent().setDroppedExp(0); + @EventHandler(priority = EventPriority.LOW) + public void onOtherDeath(@NotNull final EntityDeathEvent event) { + event.getDrops().addAll(IllusionerManager.OPTIONS.getDrops()); + event.setDroppedExp(IllusionerManager.OPTIONS.generateXp()); } }