From f970f17e7f050feba2a8f89720896b554759df2c Mon Sep 17 00:00:00 2001
From: hyperdefined <contact@hyper.lol>
Date: Sun, 30 Jan 2022 16:45:23 -0500
Subject: [PATCH] cleanup

---
 src/main/java/lol/hyper/toolstats/events/EntityDamage.java | 4 ++++
 src/main/java/lol/hyper/toolstats/events/GenerateLoot.java | 7 -------
 src/main/java/lol/hyper/toolstats/events/PickupItem.java   | 1 -
 .../java/lol/hyper/toolstats/events/VillagerTrade.java     | 2 --
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
index d0cc6eb..6d1dc8c 100644
--- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
@@ -21,6 +21,7 @@ import lol.hyper.toolstats.ToolStats;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Trident;
@@ -112,6 +113,9 @@ public class EntityDamage implements Listener {
 
     @EventHandler
     public void onDamage(EntityDamageEvent event) {
+        if (!(event.getEntity() instanceof LivingEntity)) {
+            return;
+        }
         LivingEntity livingEntity = (LivingEntity) event.getEntity();
         if (livingEntity instanceof Player) {
             Player player = (Player) livingEntity;
diff --git a/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java b/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
index 8de3c6d..7a05fc9 100644
--- a/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
+++ b/src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
@@ -26,7 +26,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.LootGenerateEvent;
-import org.bukkit.inventory.DoubleChestInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
@@ -61,10 +60,7 @@ public class GenerateLoot implements Listener {
             return;
         }
         Inventory chest = inventoryHolder.getInventory();
-        toolStats.logger.info(String.valueOf(chest.getContents().length));
-        toolStats.logger.info(String.valueOf(chest.getViewers()));
         Bukkit.getScheduler().runTaskLater(toolStats, () -> {
-            toolStats.logger.info("Later: " + chest.getViewers());
             Player player = (Player) chest.getViewers().get(0);
             for (int i = 0; i < chest.getContents().length; i++) {
                 ItemStack itemStack = chest.getItem(i);
@@ -73,9 +69,7 @@ public class GenerateLoot implements Listener {
                 }
                 String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
                 for (String x : validItems) {
-                    toolStats.logger.info("Checking " + name);
                     if (name.contains(x)) {
-                        toolStats.logger.info("contains");
                         chest.setItem(i, addLore(itemStack, player));
                     }
                 }
@@ -103,7 +97,6 @@ public class GenerateLoot implements Listener {
             lore = new ArrayList<>();
         }
         if (toolStats.checkConfig(newItem, "looted-tag")) {
-            toolStats.logger.info("adding lore to new item in chest");
             lore.add(LOOT_TIME.replace("X", format.format(finalDate)));
             lore.add(LOOT_OWNER.replace("X", owner.getName()));
         }
diff --git a/src/main/java/lol/hyper/toolstats/events/PickupItem.java b/src/main/java/lol/hyper/toolstats/events/PickupItem.java
index 37bb3d3..0b9bcb7 100644
--- a/src/main/java/lol/hyper/toolstats/events/PickupItem.java
+++ b/src/main/java/lol/hyper/toolstats/events/PickupItem.java
@@ -26,7 +26,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityPickupItemEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
diff --git a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
index 73e51f2..ea29a47 100644
--- a/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
+++ b/src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
@@ -20,7 +20,6 @@ package lol.hyper.toolstats.events;
 import lol.hyper.toolstats.ToolStats;
 import lol.hyper.toolstats.UUIDDataType;
 import org.bukkit.ChatColor;
-import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -28,7 +27,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.Merchant;
 import org.bukkit.inventory.MerchantInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;