DocRock3r/ToolStats
1
0
Fork 0
mirror of https://github.com/hyperdefined/ToolStats.git synced 2026-02-01 18:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

make item checking better

Browse Source 
fixes #42
This commit is contained in:
hyperdefined
2023-10-19 17:05:15 -04:00
parent e40e16c273
commit c7a5aef9ee
13 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@
package lol.hyper.toolstats.events;
import lol.hyper.toolstats.ToolStats;
import lol.hyper.toolstats.tools.ItemChecker;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.*;
@@ -74,7 +73,7 @@ public class EntityDamage implements Listener {
PlayerInventory attackingPlayerInventory = attackingPlayer.getInventory();
ItemStack heldItem = attackingPlayerInventory.getItemInMainHand();
// only check certain items
if (!ItemChecker.isMeleeWeapon(heldItem.getType())) {
if (!toolStats.itemChecker.isMeleeWeapon(heldItem.getType())) {
return;
}
// a player is killing another player
@@ -152,7 +151,7 @@ public class EntityDamage implements Listener {
PlayerInventory playerInventory = playerTakingDamage.getInventory();
for (ItemStack armorPiece : playerInventory.getArmorContents()) {
if (armorPiece != null) {
if (ItemChecker.isArmor(armorPiece.getType())) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
updateDamage(armorPiece, event.getFinalDamage());
}
}
@@ -182,7 +181,7 @@ public class EntityDamage implements Listener {
PlayerInventory playerInventory = playerTakingDamage.getInventory();
for (ItemStack armorPiece : playerInventory.getArmorContents()) {
if (armorPiece != null) {
if (ItemChecker.isArmor(armorPiece.getType())) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
updateDamage(armorPiece, event.getFinalDamage());
}
}
@@ -212,7 +211,7 @@ public class EntityDamage implements Listener {
PlayerInventory playerInventory = playerTakingDamage.getInventory();
for (ItemStack armorPiece : playerInventory.getArmorContents()) {
if (armorPiece != null) {
if (ItemChecker.isArmor(armorPiece.getType())) {
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
updateDamage(armorPiece, event.getFinalDamage());
}
}