Rebase

PaperMC · Oct 20, 2024 · eab341d · eab341d
1 parent b2f7f42
commit eab341d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...65-Configurable-Entity-Despawn-Time.patch → ...69-Configurable-Entity-Despawn-Time.patch b/...65-Configurable-Entity-Despawn-Time.patch → ...69-Configurable-Entity-Despawn-Time.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Entity Despawn Time
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..7a74e06f98dd17b055fa4697635395a8a9fc77ae 100644
+index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..a95d2d2b933bce0c5810d386208d67b154f75a9d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -429,6 +429,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -30,7 +30,7 @@ index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..7a74e06f98dd17b055fa4697635395a8
      public void tick() {
 +        // Paper start - entity despawn time limit
 +        if (this.despawnTime >= 0 && this.tickCount >= this.despawnTime) {
-+            this.discard();
++            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN);
 +            return;
 +        }
 +        // Paper end - entity despawn time limit