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

work

Browse Source
This commit is contained in:
hyperdefined
2022-01-28 19:03:17 -05:00
parent 781f8a7b7b
commit 93c30cc888
3 changed files with 34 additions and 1 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

@@ -67,7 +67,9 @@ public class EntityDamage implements Listener {
Player player = (Player) livingEntity;
PlayerInventory inventory = player.getInventory();
for (ItemStack armor : inventory.getArmorContents()) {
updateArmorDamage(armor, event.getDamage());
if (armor != null) {
updateArmorDamage(armor, event.getDamage());
}
}
}
}

18
src/main/java/lol/hyper/toolstats/events/EntityDeath.java
View File

@@ -2,12 +2,14 @@ package lol.hyper.toolstats.events;
import lol.hyper.toolstats.ToolStats;
import org.bukkit.ChatColor;
import org.bukkit.NamespacedKey;
import org.bukkit.entity.LivingEntity;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer;
import java.util.*;
@@ -26,6 +28,22 @@ public class EntityDeath implements Listener {
UUID livingEntityUUID = event.getEntity().getUniqueId();
if (toolStats.mobKill.trackedMobs.contains(livingEntityUUID)) {
for (ItemStack current : event.getDrops()) {
ItemMeta meta = current.getItemMeta();
boolean hasKey = false;
// check if the mob has one of our keys
// this will prevent the "dropped by" tag from being added
if (meta != null) {
PersistentDataContainer container = meta.getPersistentDataContainer();
for (NamespacedKey key : container.getKeys()) {
if (toolStats.keys.contains(key)) {
hasKey = true;
break;
}
}
}
if (hasKey) {
continue;
}
String name = current.getType().toString().toLowerCase(Locale.ROOT);
for (String item : toolStats.craftItem.validItems) {
if (name.contains(item)) {