From 1d0fa988b9e044c18db091395a68565daa3af446 Mon Sep 17 00:00:00 2001
From: brandon3055 <brandon4261@gmail.com>
Date: Wed, 8 Jan 2025 19:34:27 +1100
Subject: [PATCH] Fixed duplicate item spawning when using /give command with
 DE tools.

---
 .../draconicevolution/items/equipment/ModularAxe.java           | 2 +-
 .../draconicevolution/items/equipment/ModularBow.java           | 2 +-
 .../draconicevolution/items/equipment/ModularChestpiece.java    | 2 +-
 .../draconicevolution/items/equipment/ModularHoe.java           | 2 +-
 .../draconicevolution/items/equipment/ModularPickaxe.java       | 2 +-
 .../draconicevolution/items/equipment/ModularShovel.java        | 2 +-
 .../draconicevolution/items/equipment/ModularStaff.java         | 2 +-
 .../draconicevolution/items/equipment/ModularSword.java         | 2 +-
 .../draconicevolution/items/tools/BoundDislocator.java          | 2 +-
 .../brandon3055/draconicevolution/items/tools/Dislocator.java   | 2 +-
 .../draconicevolution/items/tools/DislocatorAdvanced.java       | 2 +-
 .../draconicevolution/items/tools/DraconiumCapacitor.java       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularAxe.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularAxe.java
index 2787ced6..9eb07ea2 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularAxe.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularAxe.java
@@ -116,7 +116,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularBow.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularBow.java
index 36fca555..9604f44a 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularBow.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularBow.java
@@ -296,7 +296,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularChestpiece.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularChestpiece.java
index 424c1e17..aa524fe6 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularChestpiece.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularChestpiece.java
@@ -156,7 +156,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularHoe.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularHoe.java
index 36c394eb..45f7bde9 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularHoe.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularHoe.java
@@ -151,7 +151,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularPickaxe.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularPickaxe.java
index 860796d4..35ddbebf 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularPickaxe.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularPickaxe.java
@@ -106,7 +106,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularShovel.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularShovel.java
index 3b266756..356a0668 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularShovel.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularShovel.java
@@ -109,7 +109,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularStaff.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularStaff.java
index 79309feb..f0fd07cc 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularStaff.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularStaff.java
@@ -143,7 +143,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularSword.java b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularSword.java
index 8f5cf243..606c658c 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularSword.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/equipment/ModularSword.java
@@ -101,7 +101,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/tools/BoundDislocator.java b/src/main/java/com/brandon3055/draconicevolution/items/tools/BoundDislocator.java
index d62c8bfb..a37a25bf 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/tools/BoundDislocator.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/tools/BoundDislocator.java
@@ -67,7 +67,7 @@ public void inventoryTick(ItemStack stack, Level world, Entity entity, int itemS
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         if (entity.level() instanceof ServerLevel && TimeKeeper.getServerTick() % 20 == 0) {
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/tools/Dislocator.java b/src/main/java/com/brandon3055/draconicevolution/items/tools/Dislocator.java
index a5d7a877..2a5a75b6 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/tools/Dislocator.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/tools/Dislocator.java
@@ -200,7 +200,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/tools/DislocatorAdvanced.java b/src/main/java/com/brandon3055/draconicevolution/items/tools/DislocatorAdvanced.java
index e74f95f5..3751a9d2 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/tools/DislocatorAdvanced.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/tools/DislocatorAdvanced.java
@@ -72,7 +72,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);
diff --git a/src/main/java/com/brandon3055/draconicevolution/items/tools/DraconiumCapacitor.java b/src/main/java/com/brandon3055/draconicevolution/items/tools/DraconiumCapacitor.java
index 90b3218d..d6c1dff4 100644
--- a/src/main/java/com/brandon3055/draconicevolution/items/tools/DraconiumCapacitor.java
+++ b/src/main/java/com/brandon3055/draconicevolution/items/tools/DraconiumCapacitor.java
@@ -223,7 +223,7 @@ public boolean canBeHurtBy(DamageSource source) {
 
     @Override
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.getAge() >= 0) {
+        if (entity.getAge() >= 0 && entity.pickupDelay != 32767) {
             entity.setExtendedLifetime();
         }
         return super.onEntityItemUpdate(stack, entity);