Patch fixes, update upstream

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.11"
+    id("io.papermc.paperweight.patcher") version "1.5.12"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"

gradle.properties

@@ -2,7 +2,7 @@ group=com.lokamc.slice
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=710dced8b70c995656a24479f9453676cf6164fc
+paperRef=5436d44bf2509ff89129f8790ee4643f09c72871
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

patches/api/0005-Add-World-Instance-flag.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add World Instance flag
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c5fe36050eeaff80cfb989fe2f38370215af6fe5..671321b77475f20ec1cf682a184d42497160dce3 100644
+index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..cac1f89dcca7cb613dcd3db5d9287ba2c61905fc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2704,6 +2704,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2713,6 +2713,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       */
      public void setAutoSave(boolean value);
  

patches/api/0012-Equipment-Packet-Caching.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Equipment Packet Caching
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e67455efc84f1e06d3396291d104ce65fee4591b..2cd46fcee9cdfd61fb86adf6a3548d87044697c1 100644
+index 65112eae8b92344796850b1e4c89e75443eab2fe..b263b8620e1119baa519cc225ff7fcfd02b9fa54 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1310,4 +1310,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1445,4 +1445,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
-     // Paper end
+     // Paper end - body yaw API
 +
 +    // Slice start
 +    /**

patches/api/0020-Non-saveable-entities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Non-saveable-entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d9929d9311e4b2b0ae13a8f6f13563257263f298..8cf34ab37824646cf674237e5dde55459cfbc6f5 100644
+index 23def071492ccd715693d534cc506936e18f0f46..a1484708c2af2be5c94a0dff1394e8bdf1f90e2e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1104,4 +1104,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1144,4 +1144,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name

patches/api/0021-Vanish.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Vanish
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8cf34ab37824646cf674237e5dde55459cfbc6f5..0df06f41ca8aef165c5e82c4792f406444c5b218 100644
+index a1484708c2af2be5c94a0dff1394e8bdf1f90e2e..8172e1e32fc86389273f5c326ce600dd65427898 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1119,4 +1119,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1159,4 +1159,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      void setSaveable(boolean saveable);
      // Slice end

patches/api/0022-PlayerResolveObjectIdEvent.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] PlayerResolveObjectIdEvent
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bf01892c248b988531d21d9fb0f74d0adf2205ac..44b537f6da989cea6ebde8d14dea834d24f8d7d4 100644
+index 04853c43b99951bf0d4c96ef73724625bdaf018f..504b1b57ba604d261f5f59dc204350f75d1777f8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -56,6 +56,8 @@ dependencies {
-     implementation("org.ow2.asm:asm-commons:9.5")
+     implementation("org.ow2.asm:asm-commons:9.7")
      // Paper end
  
 +    implementation("org.mongodb:bson:4.11.1") // Slice - MongoDB Bson Library for ObjectIds

patches/server/0001-Build-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Build Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 241808d8619e17c0681f79acbbc98af5bf52dd89..aa3263bbede7b104482cec295c17e038db3df143 100644
+index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..8aaee003050df9bd20e9f3e0263a47350c9840b1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -32,7 +32,7 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..aa3263bbede7b104482cec295c17e038
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -155,7 +159,7 @@ fun TaskContainer.registerRunTask(
+@@ -150,7 +154,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -42,7 +42,7 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..aa3263bbede7b104482cec295c17e038
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93b661e9cb7743aeff7da3972942cb73049a5e4c..2db7cb6f86a88f93fbdef0565b901c42f5c03e73 100644
+index c8772c773f9933ed1d1debfe707af4373c458152..9ce9af857a5f2414658027ff5bb765cc4233899b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0006-Add-World-Instance-flag.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add World Instance flag
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6907d1be36fbdf0856c0e11983218d2fd1f9cb46..7de4209af926c0ca3449c977a98b4c999635bd08 100644
+index 502bdc726b7890b00ee36871d905dea44e8719e3..4653878c059a15491eb54d7211311db7e2fe570a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -17,10 +17,10 @@ index 6907d1be36fbdf0856c0e11983218d2fd1f9cb46..7de4209af926c0ca3449c977a98b4c99
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bfb178c69026e9759e9afaebb9da141b62d1f144..8eddc09c4c6af56bfd578641fe983fb7f37885cf 100644
+index 01797d9791f19dfda4b168218eadeaae97f11eab..2e5fae21dcf511c18d309780fcc3204d3bfa7af2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1313,6 +1313,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1333,6 +1333,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          this.world.noSave = !value;
      }
  

patches/server/0012-AntiXray-Bypass.patch

@@ -17,7 +17,7 @@ index e7fe98ea30ae6d0baea3ec1f9f98a89502a49a12..7e2651aa63cc9ddbe28fb9ecbc518835
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a72b24e9695fa1375dc787fc6b2ac163acc5bec0..4d6e9fb4b3a880ce2cd7e194fbb37df7abc087a2 100644
+index bbafd70973b36fefe4f0228d6ca7b24f9771ead7..a86600e01572ee14f35ecf1b7e71dbac369632e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -199,6 +199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,7 +28,7 @@ index a72b24e9695fa1375dc787fc6b2ac163acc5bec0..4d6e9fb4b3a880ce2cd7e194fbb37df7
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2954,6 +2955,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2952,6 +2953,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  

patches/server/0013-Add-PlayerPreChunkLoadEvent.patch

@@ -18,10 +18,10 @@ index 1b090f1e79b996e52097afc49c1cec85936653e6..5185bcbf5363fa2c7e2b0226706cc66d
          private static final byte CHUNK_TICKET_STAGE_NONE           = 0;
          private static final byte CHUNK_TICKET_STAGE_LOADING        = 1;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8eddc09c4c6af56bfd578641fe983fb7f37885cf..57288d7a643a407cf1f079e08e84a6c1a6937dc4 100644
+index 2e5fae21dcf511c18d309780fcc3204d3bfa7af2..fd8c6a3aaba37bb7439e74b9fc765dd7332041d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -546,6 +546,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -547,6 +547,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return true;
      }
  

patches/server/0026-Packet-obfuscation-and-reduction.patch

@@ -144,7 +144,7 @@ index 529ab44baaf573b97cf7e89560c548642733188f..e3e0f306ebed31ce4742e7d2f15ab102
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 20f8e96110a3a6401e71dc9b61fb5678e17fc428..00125637b8c3324eff2461ec6546e238ce358779 100644
+index a2aa1f3f52b165e8815e5d5ba58453e02f3ed330..a23c584ce1f9abcc911aa6a39715b8eeca4ff0af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3405,7 +3405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -170,10 +170,10 @@ index de8b794575dfad2ced1b44fab8dffc248ba47d19..7e2fa586ae255cb94e302c14d0811e36
  
      public void startAutoSpinAttack(int riptideTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d6e9fb4b3a880ce2cd7e194fbb37df7abc087a2..7d4615d97256870aea8c758dde8d6908688615a0 100644
+index a86600e01572ee14f35ecf1b7e71dbac369632e1..83b3f00d0570d7909931434cb425cb9baff513b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2757,7 +2757,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2755,7 +2755,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.sendHealthUpdate();
              }
          }

patches/server/0028-Equipment-Packet-Caching.patch

@@ -59,7 +59,7 @@ index e3e0f306ebed31ce4742e7d2f15ab102b93a9dff..4f4ea6dcef4e1960ac69271fbd771dd3
  
          if (!this.entity.getPassengers().isEmpty()) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 23570a0b1227a840b9c1e6ae326827ea655bb5f7..e2b6d539395fbc59116cfce56189e0f129a34e0d 100644
+index e9bb7feb591032904516d1b9374f486d8a7d066c..86e173f1d916ca5545d012e4c86919f402253f1c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -195,13 +195,13 @@ index 23570a0b1227a840b9c1e6ae326827ea655bb5f7..e2b6d539395fbc59116cfce56189e0f1
 +    // Slice end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3f952d1409118535f325f614f1a6507c40efa4d6..3e36b1e140c5f82018d603db84eaab2e1c80f6da 100644
+index c4a166a0c226c6083c25c58145d9631d4296e615..187cea96bbe0f1c157484ad42e74951bc714d199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1156,4 +1156,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1210,4 +1210,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         getHandle().knockback(strength, directionX, directionZ);
+         this.getHandle().setYBodyRot(bodyYaw);
-     };
+     }
-     // Paper end
+     // Paper end - body yaw API
 +
 +    // Slice start
 +    @Override

patches/server/0034-Non-saveable-entities.patch

@@ -18,7 +18,7 @@ index c78cbec447032de9fe69748591bef6be300160ed..bb3f14d00a8894fc4dfa12b29c27ef56
                  if (entity.isVehicle()) {
                      // we cannot assume that these entities are contained within this chunk, because entities can
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 00125637b8c3324eff2461ec6546e238ce358779..1d35db213e7ac7518c587cc0dd0c80c3f99a0c41 100644
+index a23c584ce1f9abcc911aa6a39715b8eeca4ff0af..e25ca5a3f2b7c4573fefba976bc0e79d7a491b62 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -424,6 +424,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -39,10 +39,10 @@ index 00125637b8c3324eff2461ec6546e238ce358779..1d35db213e7ac7518c587cc0dd0c80c3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0b5a31477e3b76833fb97a455842316193663c8e..5db4cf24de9a1c1980f22e72b6f09da146017189 100644
+index e8e4489bcd64fde1b3226bdc7a7cc612508bda3f..56044646165af2abefc6ab1b73feda4a8778de87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1228,4 +1228,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1270,4 +1270,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().getScoreboardName();
      }
      // Paper end - entity scoreboard name

patches/server/0039-Shared-Data-Storage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shared Data Storage
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index f2e30d8743a97c0541808dc5c03300c0d881b843..4087fb8ab1b42ea5367b4461cf9b1f2f6bed0309 100644
+index 0cc2307636279915c1f8529e62174cc696e185ee..220e5ede5752a4b9ab7e35c3ee4f0b4a26b2986c 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -334,6 +334,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -336,6 +336,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
@@ -17,7 +17,7 @@ index f2e30d8743a97c0541808dc5c03300c0d881b843..4087fb8ab1b42ea5367b4461cf9b1f2f
  
      public BlockUpdates blockUpdates;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2db7cb6f86a88f93fbdef0565b901c42f5c03e73..017644fb55a2713d911d0a8bb1cc8a2aff456f8a 100644
+index 9ce9af857a5f2414658027ff5bb765cc4233899b..b8a43a2833b9f014067681277edad3b96a6d63cd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -83,10 +83,10 @@ index 2db7cb6f86a88f93fbdef0565b901c42f5c03e73..017644fb55a2713d911d0a8bb1cc8a2a
              this.isSaving = false;
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 21f54a4a3de169ede1687324009aea3f9d986db4..4e5bdf47beab8477fd5278fc4c9ff162ad835d12 100644
+index 4653878c059a15491eb54d7211311db7e2fe570a..d60d1fe0261c79d77df982b76bfe96b91f6970de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2116,7 +2116,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2127,7 +2127,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public MapItemSavedData getMapData(String id) {
          // Paper start - Call missing map initialize event and set id
@@ -95,7 +95,7 @@ index 21f54a4a3de169ede1687324009aea3f9d986db4..4e5bdf47beab8477fd5278fc4c9ff162
  
          final net.minecraft.world.level.saveddata.SavedData existing = storage.cache.get(id);
          if (existing == null && !storage.cache.containsKey(id)) {
-@@ -2143,12 +2143,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2154,12 +2154,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
          MapInitializeEvent event = new MapInitializeEvent(state.mapView);
          Bukkit.getServer().getPluginManager().callEvent(event);
          // CraftBukkit end

patches/server/0040-Vanish.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Vanish
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 297e2b8438dde1c1903505e8e7bbc94c3340d2d1..c07e6ff45c2dd51fcd2031bae3d7b32cb614b7ac 100644
+index 3a520677dce5cba5a348ec295ea07cd090e541f9..e858d24061ce8fad612c12adac205c7ad59b8767 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -426,6 +426,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -26,10 +26,10 @@ index 297e2b8438dde1c1903505e8e7bbc94c3340d2d1..c07e6ff45c2dd51fcd2031bae3d7b32c
          } else {
              boolean flag2 = this.isStateClimbable(state);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5db4cf24de9a1c1980f22e72b6f09da146017189..a3ab470b534441c0985e137ea299c8fc46bd982b 100644
+index 56044646165af2abefc6ab1b73feda4a8778de87..8af60900f5e385546bb452cd0bc0c702d5df0a46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1240,4 +1240,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1282,4 +1282,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity.saveable = saveable;
      }
      // Slice end

patches/server/0041-PlayerResolveObjectIdEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerResolveObjectIdEvent
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f9a08cb94f5d31e16b4fbfc19b6c18d429a53936..ed15e47b52103b4341e69849bd35bdad5d2fd92d 100644
+index 85c077a53422e1c2dc1ff550ac117016c3d8e3f0..46980b062980be8c564a215a2ae67e0d1fe5251e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,8 @@ dependencies {
@@ -18,7 +18,7 @@ index f9a08cb94f5d31e16b4fbfc19b6c18d429a53936..ed15e47b52103b4341e69849bd35bdad
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c07e6ff45c2dd51fcd2031bae3d7b32cb614b7ac..6846b526ab04eaa6596df635c282c236a1f529c2 100644
+index e858d24061ce8fad612c12adac205c7ad59b8767..ad2567133405744abcf20d8572d6c7afc37581af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -252,7 +252,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -41,7 +41,7 @@ index c07e6ff45c2dd51fcd2031bae3d7b32cb614b7ac..6846b526ab04eaa6596df635c282c236
              }
              // Paper end - Folia schedulers
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index acbb64010cd59668aa1bcb52ff1220789cadb1d3..190f3e26d379f426a3e7745e5529e02c0ead724e 100644
+index 7984365c8290ac9e526a413b56e1c8c0841e330c..933fc8295b3b697c9f8cd8516ccac13348dcb843 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -7,6 +7,8 @@ import java.util.Arrays;
@@ -66,7 +66,7 @@ index acbb64010cd59668aa1bcb52ff1220789cadb1d3..190f3e26d379f426a3e7745e5529e02c
  import org.bukkit.block.Block;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.entity.memory.CraftMemoryMapper;
-@@ -74,6 +74,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -75,6 +75,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
      protected final PermissibleBase perm = new PermissibleBase(this);
      private boolean op;
      private GameMode mode;
@@ -74,7 +74,7 @@ index acbb64010cd59668aa1bcb52ff1220789cadb1d3..190f3e26d379f426a3e7745e5529e02c
  
      public CraftHumanEntity(final CraftServer server, final Player entity) {
          super(server, entity);
-@@ -82,6 +83,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -83,6 +84,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          this.enderChest = new CraftInventory(entity.getEnderChestInventory());
      }