From 2f58805818d96b086acea7db89cfcd0c6038cbb8 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Tue, 19 Nov 2024 12:46:16 +0100 Subject: [PATCH] Rebase --- ....patch => 1068-Configurable-Entity-Despawn-Time.patch} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename patches/server/{1069-Configurable-Entity-Despawn-Time.patch => 1068-Configurable-Entity-Despawn-Time.patch} (86%) diff --git a/patches/server/1069-Configurable-Entity-Despawn-Time.patch b/patches/server/1068-Configurable-Entity-Despawn-Time.patch similarity index 86% rename from patches/server/1069-Configurable-Entity-Despawn-Time.patch rename to patches/server/1068-Configurable-Entity-Despawn-Time.patch index 77b4d681e2..9f3d4aa488 100644 --- a/patches/server/1069-Configurable-Entity-Despawn-Time.patch +++ b/patches/server/1068-Configurable-Entity-Despawn-Time.patch @@ -5,10 +5,10 @@ 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..a95d2d2b933bce0c5810d386208d67b154f75a9d 100644 +index 8be1b051543cda2b2e9e3d337834757e53f442de..ed5b00620527c1776722d25b1b45f1544802a341 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 +@@ -432,6 +432,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess private UUID originWorld; public boolean freezeLocked = false; // Paper - Freeze Tick Lock API public boolean fixedPose = false; // Paper - Expand Pose API @@ -16,7 +16,7 @@ index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..a95d2d2b933bce0c5810d386208d67b1 public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); -@@ -552,6 +553,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -614,6 +615,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); @@ -24,7 +24,7 @@ index 4b54d0ea31062972e68ee8fafe3cfaf68f65a5cd..a95d2d2b933bce0c5810d386208d67b1 this.passengers = ImmutableList.of(); this.deltaMovement = Vec3.ZERO; this.bb = Entity.INITIAL_AABB; -@@ -845,6 +847,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -912,6 +914,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public void tick() {