Ignore "fake player" npcs in EntityPickupItemEvent

This commit is contained in:
nossr50
2020-12-31 15:49:32 -08:00
parent 2664ae4bd6
commit 8ee405fbfd
2 changed files with 7 additions and 4 deletions

View File

@ -447,6 +447,10 @@ public class PlayerListener implements Listener {
if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
return;
if(Misc.isNPCEntityExcludingVillagers(event.getEntity())) {
return;
}
if(event.getEntity() instanceof Player)
{
Player player = (Player) event.getEntity();
@ -463,13 +467,11 @@ public class PlayerListener implements Listener {
}
//Profile not loaded
if(UserManager.getPlayer(player) == null)
{
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
if(mcMMOPlayer == null) {
return;
}
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
Item drop = event.getItem();
ItemStack dropStack = drop.getItemStack();