From eab341d65993f85f479a7b66e8da86ec36f0d83b Mon Sep 17 00:00:00 2001
From: Bjarne Koll <lynxplay101@gmail.com>
Date: Mon, 21 Oct 2024 01:46:12 +0200
Subject: [PATCH] Rebase

---
 ...Time.patch => 1069-Configurable-Entity-Despawn-Time.patch} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename patches/server/{1065-Configurable-Entity-Despawn-Time.patch => 1069-Configurable-Entity-Despawn-Time.patch} (91%)

diff --git a/patches/server/1065-Configurable-Entity-Despawn-Time.patch b/patches/server/1069-Configurable-Entity-Despawn-Time.patch
similarity index 91%
rename from patches/server/1065-Configurable-Entity-Despawn-Time.patch
rename to patches/server/1069-Configurable-Entity-Despawn-Time.patch
index e703796c72c7..77b4d681e24d 100644
--- a/patches/server/1065-Configurable-Entity-Despawn-Time.patch
+++ b/patches/server/1069-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