Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-11 13:11:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually fix an error when NPCS would kill a mob closes #127

Browse Source
This commit is contained in:
HexedHero 2020-09-12 00:16:41 +01:00
parent 9855be1928
commit bc7bfb066f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/Indyuce/mmoitems/manager/DropTableManager.java
View File

@ -81,9 +81,11 @@ public class DropTableManager implements Listener {
@EventHandler @EventHandler
public void blockDrops(EntityDeathEvent event) { public void blockDrops(EntityDeathEvent event) {
LivingEntity entity = event.getEntity(); LivingEntity entity = event.getEntity();
Player killer = entity.getKiller();
if (killer != null && killer.hasMetadata("NPC"))
return;
if (monsters.containsKey(entity.getType())) if (monsters.containsKey(entity.getType()))
event.getDrops() event.getDrops().addAll(monsters.get(entity.getType()).read(killer != null ? PlayerData.get(killer) : null, false));
.addAll(monsters.get(entity.getType()).read(entity.getKiller() != null && !entity.hasMetadata("NPC") ? PlayerData.get(entity.getKiller()) : null, false));
} }
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)