Backport some changes from Paper upstream

Author: Dreeam-qwq

…/0303-optimize-collidedAlongVector.patch …/0304-optimize-collidedAlongVector.patchleaf-server/minecraft-patches/features/0303-optimize-collidedAlongVector.patch renamed to leaf-server/minecraft-patches/features/0304-optimize-collidedAlongVector.patch leaf-server/minecraft-patches/features/0303-optimize-collidedAlongVector.patch renamed to leaf-server/minecraft-patches/features/0304-optimize-collidedAlongVector.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] optimize collidedAlongVector
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index f6d619709d4e5b0e6d1b943226579d7388835cdb..dea7ebe75a043b509e49a589a66ec99abb32d6ed 100644
+index 1a81943b3a721a5ad18dcfcb76c21773d94c9a80..3969d0a073a70de4e0cd6084e41d526cadd800d9 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1749,7 +1749,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

…s/0304-Rewrite-entity-despawn-time.patch …s/0305-Rewrite-entity-despawn-time.patchleaf-server/minecraft-patches/features/0304-Rewrite-entity-despawn-time.patch renamed to leaf-server/minecraft-patches/features/0305-Rewrite-entity-despawn-time.patch leaf-server/minecraft-patches/features/0304-Rewrite-entity-despawn-time.patch renamed to leaf-server/minecraft-patches/features/0305-Rewrite-entity-despawn-time.patch

@@ -40,7 +40,7 @@ index cb1be4947ea2d85c6dcdc7424a4b712dcce0a40e..01f7390f3fb2a423cec373a2bb5ccbee
              for (Entity entity : passengerEntity.getPassengers()) {
                  this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index fef583625899091b13439e0d459b7538c866d712..e84ff9d5a1b495170b503dece72f7766b347c2d0 100644
+index 3969d0a073a70de4e0cd6084e41d526cadd800d9..741e576e6429fc80f5aa41b846ae128701e95873 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -373,6 +373,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -118,15 +118,15 @@ index fef583625899091b13439e0d459b7538c866d712..e84ff9d5a1b495170b503dece72f7766
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
-@@ -2564,6 +2602,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2579,6 +2617,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              if (this.maxAirTicks != this.getDefaultMaxAirSupply()) {
                  output.putInt("Bukkit.MaxAirSupply", this.getMaxAirSupply());
              }
 +            this.syncEntityAge(); // Leaf - Rewrite entity despawn time
              output.putInt("Spigot.ticksLived", this.totalEntityAge); // Paper
              // CraftBukkit end
              output.storeNullable("CustomName", ComponentSerialization.CODEC, this.getCustomName());
-@@ -2721,7 +2760,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2736,7 +2775,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
 
              // CraftBukkit start
              // Spigot start
@@ -135,7 +135,7 @@ index fef583625899091b13439e0d459b7538c866d712..e84ff9d5a1b495170b503dece72f7766
                  this.totalEntityAge = input.getIntOr("Spigot.ticksLived", 0); // Paper
              }
              // Spigot end
-@@ -5320,9 +5359,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5335,9 +5374,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
 
      @Override
      public boolean shouldBeSaved() {

…atures/0305-Optimize-Vec3i-hashing.patch …atures/0306-Optimize-Vec3i-hashing.patchleaf-server/minecraft-patches/features/0305-Optimize-Vec3i-hashing.patch renamed to leaf-server/minecraft-patches/features/0306-Optimize-Vec3i-hashing.patch leaf-server/minecraft-patches/features/0305-Optimize-Vec3i-hashing.patch renamed to leaf-server/minecraft-patches/features/0306-Optimize-Vec3i-hashing.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Github Actions <[email protected]>
+Date: Sat, 1 Jan 2000 00:00:00 +0000
+Subject: [PATCH] Paper Upstream
+
+Backported from > Paper 1.21.11
+
+Original license: GPLv3
+Original project: https://github.com/PaperMC/Paper
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 372e0202cdef43d7c25645ba468bbaaddf09b144..f922ca23e6a155553efe946d8852900e20e55aa5 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -352,6 +352,7 @@ public class ServerGamePacketListenerImpl
+ 
+     @Override
+     public void tick() {
++        if (this.isDisconnected()) return; // Paper
+         if (this.ackBlockChangesUpTo > -1) {
+             this.send(new ClientboundBlockChangedAckPacket(this.ackBlockChangesUpTo));
+             this.ackBlockChangesUpTo = -1;