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

add missing damage tracking

Browse Source
This commit is contained in:
hyperdefined
2025-03-28 18:31:59 -04:00
parent 71f3a3ea10
commit e37048ff01
1 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@ public class EntityDamage implements Listener {
if (newItem != null) { if (newItem != null) {
attackingPlayerInventory.getItemInMainHand().setItemMeta(newItem); attackingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
} }
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
return; return;
} }
// player is killing regular mob // player is killing regular mob
@@ -96,6 +97,7 @@ public class EntityDamage implements Listener {
ItemMeta newMeta; ItemMeta newMeta;
// trident is killing player // trident is killing player
if (mobBeingAttacked instanceof Player) { if (mobBeingAttacked instanceof Player) {
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
newMeta = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1); newMeta = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
} else { } else {
// trident is killing a mob // trident is killing a mob
@@ -135,6 +137,7 @@ public class EntityDamage implements Listener {
shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow); shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow);
} }
} }
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
} else { } else {
// player is shooting a mob // player is shooting a mob
ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1); ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
@@ -157,21 +160,7 @@ public class EntityDamage implements Listener {
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) { if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
return; return;
} }
PlayerInventory playerInventory = playerTakingDamage.getInventory(); updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
ItemStack[] armorContents = playerInventory.getArmorContents();
for (ItemStack armorPiece : armorContents) {
if (armorPiece != null) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
ItemMeta newItem = toolStats.itemLore.updateDamage(armorPiece, event.getFinalDamage(), false);
if (newItem != null) {
armorPiece.setItemMeta(newItem);
}
}
}
}
// apply the new armor
playerInventory.setArmorContents(armorContents);
} }
} }
@@ -192,21 +181,7 @@ public class EntityDamage implements Listener {
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) { if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
return; return;
} }
PlayerInventory playerInventory = playerTakingDamage.getInventory(); updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
ItemStack[] armorContents = playerInventory.getArmorContents();
for (ItemStack armorPiece : armorContents) {
if (armorPiece != null) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
ItemMeta newItem = toolStats.itemLore.updateDamage(armorPiece, event.getFinalDamage(),false);
if (newItem != null) {
armorPiece.setItemMeta(newItem);
}
}
}
}
// apply the new armor
playerInventory.setArmorContents(armorContents);
} }
} }
@@ -227,21 +202,23 @@ public class EntityDamage implements Listener {
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) { if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
return; return;
} }
PlayerInventory playerInventory = playerTakingDamage.getInventory(); updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
ItemStack[] armorContents = playerInventory.getArmorContents(); }
for (ItemStack armorPiece : armorContents) { }
if (armorPiece != null) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) { private void updateArmorDamage(PlayerInventory playerInventory, double damage) {
ItemMeta newItem = toolStats.itemLore.updateDamage(armorPiece, event.getFinalDamage(), false); ItemStack[] armorContents = playerInventory.getArmorContents();
if (newItem != null) { for (ItemStack armorPiece : armorContents) {
armorPiece.setItemMeta(newItem); if (armorPiece != null) {
} if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
ItemMeta newItem = toolStats.itemLore.updateDamage(armorPiece, damage, false);
if (newItem != null) {
armorPiece.setItemMeta(newItem);
} }
} }
} }
// apply the new armor
playerInventory.setArmorContents(armorContents);
} }
// apply the new armor
playerInventory.setArmorContents(armorContents);
} }
} }