Fixed duplicate item spawning when using /give command with DE tools.

Draconic-Inc · Jan 8, 2025 · 1d0fa98 · 1d0fa98
1 parent 185cfa1
commit 1d0fa98
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);