handle item pickup better

This commit is contained in:
hyperdefined
2022-05-10 15:29:53 -04:00
parent f9cff275b5
commit cd6cb999c0

View File

@@ -20,8 +20,7 @@ package lol.hyper.toolstats.events;
import lol.hyper.toolstats.ToolStats; import lol.hyper.toolstats.ToolStats;
import lol.hyper.toolstats.UUIDDataType; import lol.hyper.toolstats.UUIDDataType;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.*;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.entity.EntityPickupItemEvent;
@@ -49,16 +48,20 @@ public class PickupItem implements Listener {
} }
Entity entity = event.getEntity(); Entity entity = event.getEntity();
if (entity instanceof Player) { if (entity instanceof Player) {
ItemStack itemStack = event.getItem().getItemStack(); Item item = event.getItem();
if (itemStack.getType() == Material.ELYTRA) { if (item.getType() == EntityType.DROPPED_ITEM) {
ItemStack itemStack = event.getItem().getItemStack();
ItemMeta meta = itemStack.getItemMeta(); ItemMeta meta = itemStack.getItemMeta();
if (meta == null) { if (meta == null) {
toolStats.logger.info("null");
return; return;
} }
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
// the elytra has the new key, set the lore to it if (itemStack.getType() == Material.ELYTRA) {
if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) { // the elytra has the new key, set the lore to it
addLore(itemStack, (Player) event.getEntity()); if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
addLore(itemStack, (Player) event.getEntity());
}
} }
} }
} }