Attempt to prevent upgrade dupes in item frames, etc

Direwolf20-MC · Direwolf20-MC · commit 28e552f5827c · 2025-03-30T16:40:56.000-04:00
diff --git a/src/main/java/com/direwolf20/justdirethings/common/events/PlayerEvents.java b/src/main/java/com/direwolf20/justdirethings/common/events/PlayerEvents.java
@@ -42,7 +42,7 @@ public static void PlayerDestroyItem(PlayerDestroyItemEvent event) {
         if (itemStack.getItem() instanceof ToggleableTool toggleableTool) {
             EnumSet<Ability> abilities = toggleableTool.getAbilities();
             for (Ability ability : abilities) {
-                if (ToggleableTool.hasUpgrade(itemStack, ability) && ability.requiresUpgrade()) {
+                if (ToggleableTool.hasUpgrade(itemStack, ability) && ability.requiresUpgrade() && itemStack.getMaxDamage() - itemStack.getDamageValue() <= 1) {
                     ItemStack upgradeStack = new ItemStack(ability.getUpgradeItem());
                     event.getEntity().drop(upgradeStack, true);
                 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static void PlayerDestroyItem(PlayerDestroyItemEvent event) {`
`42`	`42`	`if (itemStack.getItem() instanceof ToggleableTool toggleableTool) {`
`43`	`43`	`EnumSet<Ability> abilities = toggleableTool.getAbilities();`
`44`	`44`	`for (Ability ability : abilities) {`
`45`		`- if (ToggleableTool.hasUpgrade(itemStack, ability) && ability.requiresUpgrade()) {`
	`45`	`+ if (ToggleableTool.hasUpgrade(itemStack, ability) && ability.requiresUpgrade() && itemStack.getMaxDamage() - itemStack.getDamageValue() <= 1) {`
`46`	`46`	`ItemStack upgradeStack = new ItemStack(ability.getUpgradeItem());`
`47`	`47`	`event.getEntity().drop(upgradeStack, true);`
`48`	`48`	`}`