DocRock3r/ToolStats
1
0
Fork 0
mirror of https://github.com/hyperdefined/ToolStats.git synced 2025-12-06 06:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
hyperdefined
2022-01-30 16:45:23 -05:00
parent 8305c52f3b
commit f970f17e7f
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/lol/hyper/toolstats/events/EntityDamage.java
View File

@@ -21,6 +21,7 @@ import lol.hyper.toolstats.ToolStats;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Trident; import org.bukkit.entity.Trident;
@@ -112,6 +113,9 @@ public class EntityDamage implements Listener {
@EventHandler @EventHandler
public void onDamage(EntityDamageEvent event) { public void onDamage(EntityDamageEvent event) {
if (!(event.getEntity() instanceof LivingEntity)) {
return;
}
LivingEntity livingEntity = (LivingEntity) event.getEntity(); LivingEntity livingEntity = (LivingEntity) event.getEntity();
if (livingEntity instanceof Player) { if (livingEntity instanceof Player) {
Player player = (Player) livingEntity; Player player = (Player) livingEntity;

7
src/main/java/lol/hyper/toolstats/events/GenerateLoot.java
View File

@@ -26,7 +26,6 @@ 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.world.LootGenerateEvent; import org.bukkit.event.world.LootGenerateEvent;
import org.bukkit.inventory.DoubleChestInventory;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -61,10 +60,7 @@ public class GenerateLoot implements Listener {
return; return;
} }
Inventory chest = inventoryHolder.getInventory(); Inventory chest = inventoryHolder.getInventory();
toolStats.logger.info(String.valueOf(chest.getContents().length));
toolStats.logger.info(String.valueOf(chest.getViewers()));
Bukkit.getScheduler().runTaskLater(toolStats, () -> { Bukkit.getScheduler().runTaskLater(toolStats, () -> {
toolStats.logger.info("Later: " + chest.getViewers());
Player player = (Player) chest.getViewers().get(0); Player player = (Player) chest.getViewers().get(0);
for (int i = 0; i < chest.getContents().length; i++) { for (int i = 0; i < chest.getContents().length; i++) {
ItemStack itemStack = chest.getItem(i); ItemStack itemStack = chest.getItem(i);
@@ -73,9 +69,7 @@ public class GenerateLoot implements Listener {
} }
String name = itemStack.getType().toString().toLowerCase(Locale.ROOT); String name = itemStack.getType().toString().toLowerCase(Locale.ROOT);
for (String x : validItems) { for (String x : validItems) {
toolStats.logger.info("Checking " + name);
if (name.contains(x)) { if (name.contains(x)) {
toolStats.logger.info("contains");
chest.setItem(i, addLore(itemStack, player)); chest.setItem(i, addLore(itemStack, player));
} }
} }
@@ -103,7 +97,6 @@ public class GenerateLoot implements Listener {
lore = new ArrayList<>(); lore = new ArrayList<>();
} }
if (toolStats.checkConfig(newItem, "looted-tag")) { 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_TIME.replace("X", format.format(finalDate)));
lore.add(LOOT_OWNER.replace("X", owner.getName())); lore.add(LOOT_OWNER.replace("X", owner.getName()));
} }

1
src/main/java/lol/hyper/toolstats/events/PickupItem.java
View File

@@ -26,7 +26,6 @@ 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;
import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataContainer;

2
src/main/java/lol/hyper/toolstats/events/VillagerTrade.java
View File

@@ -20,7 +20,6 @@ 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.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Cat;
import org.bukkit.entity.Player; 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;
@@ -28,7 +27,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Merchant;
import org.bukkit.inventory.MerchantInventory; import org.bukkit.inventory.MerchantInventory;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataContainer;