diff --git a/pom.xml b/pom.xml index df0309c..9841f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.rsscripting RS-ServerAdmin RS-ServerAdmin - 1.0.1 + 1.2.0 21 diff --git a/src/main/java/com/rsscripting/serveradmin/listeners/MobEquipmentDropListener.java b/src/main/java/com/rsscripting/serveradmin/listeners/MobEquipmentDropListener.java index 8da07eb..27f9383 100644 --- a/src/main/java/com/rsscripting/serveradmin/listeners/MobEquipmentDropListener.java +++ b/src/main/java/com/rsscripting/serveradmin/listeners/MobEquipmentDropListener.java @@ -4,6 +4,7 @@ import com.rsscripting.serveradmin.RSServerAdmin; import com.rsscripting.serveradmin.dao.MobEquipmentDropSettingsDAO; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDeathEvent; @@ -20,6 +21,24 @@ public class MobEquipmentDropListener implements Listener { LivingEntity entity = event.getEntity(); + /* + * Prevent player equipment duplication. + */ + if (entity instanceof Player) { + return; + } + + /* + * Only apply forced equipment drops when a player + * actually killed the mob. + */ + Player killer = + entity.getKiller(); + + if (killer == null) { + return; + } + EntityEquipment equipment = entity.getEquipment();