Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.19.3-R0.1-SNAPSHOT
 
 mcVersion=1.19.3
-paperRef=048ee5872d791df0a9aad856723958c8dc602e48
+paperRef=78a91dfb48e5e3deefcc19796579e71a7dd89e40
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0013-Remove-vanilla-profiler.patch

@@ -840,7 +840,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..a07da939bb6b2dd0bd75cc74dd794936
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08cb3db28f13c352a162009deeb28ee637e98d2a..81b27d48c1421c02f86b95db1d7a1eeaf130cd09 100644
+index 50d8d16b1856c0c875ccabbcfc240379a7669559..1192b751c8d00754d40781e714bc3f6330767f75 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,7 +390,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -936,10 +936,10 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b3a02e9c3 100644
+index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..da40e419a245a43dec75a0cc3028cb0a42087c3f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -787,7 +787,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -788,7 +788,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
  
      public void baseTick() {
@@ -947,7 +947,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
          this.feetBlockState = null;
          if (this.isPassenger() && this.getVehicle().isRemoved()) {
-@@ -848,7 +847,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -849,7 +848,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
  
          this.firstTick = false;
@@ -955,7 +955,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
      }
  
      public void setSharedFlagOnFire(boolean onFire) {
-@@ -1022,7 +1020,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1023,7 +1021,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
              }
  
@@ -963,7 +963,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
                  this.stuckSpeedMultiplier = Vec3.ZERO;
-@@ -1031,7 +1028,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1032,7 +1029,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              // Paper start - ignore movement changes while inactive.
              if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
                  setDeltaMovement(Vec3.ZERO);
@@ -971,7 +971,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
                  return;
              }
              // Paper end
-@@ -1052,8 +1048,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1053,8 +1049,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
              }
  
@@ -980,7 +980,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
              boolean flag = !Mth.equal(movement.x, vec3d1.x);
              boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
  
-@@ -1071,9 +1065,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1072,9 +1066,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              BlockState iblockdata = this.level.getBlockState(blockposition);
  
              this.checkFallDamage(vec3d1.y, this.onGround, iblockdata, blockposition);
@@ -991,7 +991,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
                  if (this.horizontalCollision) {
                      Vec3 vec3d2 = this.getDeltaMovement();
  
-@@ -1212,8 +1204,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1213,8 +1205,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) {
                      this.setRemainingFireTicks(-this.getFireImmuneTicks());
                  }
@@ -1000,7 +1000,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
              }
          }
          // Paper start - detailed watchdog information
-@@ -2884,7 +2874,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2894,7 +2884,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
  
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1008,7 +1008,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
                      this.portalTime = i;
                      // Paper start
                      io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
-@@ -2902,7 +2891,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2912,7 +2901,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
                      } // Paper
                      // CraftBukkit end
@@ -1016,7 +1016,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
                  }
  
                  this.isInsidePortal = false;
-@@ -3367,14 +3355,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3377,14 +3365,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end
          if (this.level instanceof ServerLevel && !this.isRemoved()) {
@@ -1031,7 +1031,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
              PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
  
              if (shapedetectorshape == null) {
-@@ -3408,7 +3394,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3418,7 +3404,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.unRide();
                  // CraftBukkit end
  
@@ -1039,7 +1039,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
                  // Paper start - Change lead drop timing to prevent dupe
                  if (this instanceof Mob) {
                      ((Mob) this).dropLeash(true, true); // Paper drop lead
-@@ -3431,10 +3416,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3441,10 +3426,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
  
                  this.removeAfterChangingDimensions();
@@ -1051,7 +1051,7 @@ index be54a70b47433c2abaeb8632ffe55d0762f619d6..372a60f326c1472697a0153bb7cdd08b
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 864ab97b7a6c62c376ca38dbbc65bc9406dfd62b..5f3796c9b0f910e578fe70c46ca97c36b70378f8 100644
+index 529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e..3a116b37a89306ea8f2b7eec867d0e3c3523f74c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -393,7 +393,6 @@ public abstract class LivingEntity extends Entity {
@@ -1408,10 +1408,10 @@ index f2e84e832ad95df26fe3b9ba439ce38fc59b3585..831bd88383e48f704d6cb4f8f5137114
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index e8574bd4b412c1db82aaec9dced47b63de9dbf28..dd6edc8d69903b79356d3603d5c48e7d862d4256 100644
+index 9058f9f2e561cda9f475f33218bf7a78297de4bc..09240841cd9216c06da8dc4059f8a60ef9022d39 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -78,12 +78,8 @@ public class Tadpole extends AbstractFish {
+@@ -79,12 +79,8 @@ public class Tadpole extends AbstractFish {
  
      @Override
      protected void customServerAiStep() {
@@ -1456,7 +1456,7 @@ index 51ad507a3b625201ecca50bd92f8f089f3b4d60a..818d1f09b63ad0df9e3fae059a058015
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 45741410a13cffe3419e34b5607b048bbcf1c3ff..ca749e552ecc995e8a9d5168c1959b95c6e9cb97 100644
+index 5d3b3cb3a882eb5d716f678095a65b28d0967476..739f4f86af7951ea42a3b248b93989de8b8f4f54 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -128,9 +128,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {

patches/server/0036-Remove-streams-from-getting-nearby-players.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 372a60f326c1472697a0153bb7cdd08b3a02e9c3..e537f43d39be4e415b106ff7e1683b415a8ea79b 100644
+index da40e419a245a43dec75a0cc3028cb0a42087c3f..f5a6da990507e695d9a3c198a6e72dd45906c3e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -487,17 +487,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -488,17 +488,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -73,7 +73,7 @@ index 372a60f326c1472697a0153bb7cdd08b3a02e9c3..e537f43d39be4e415b106ff7e1683b41
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -506,6 +526,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -507,6 +527,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }

patches/server/0039-Reduce-entity-allocations.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e537f43d39be4e415b106ff7e1683b415a8ea79b..820bb37e9d9e670c2f8282967926dcce61852bf5 100644
+index f5a6da990507e695d9a3c198a6e72dd45906c3e3..58c3ca0a917803e68701b6ac2ec193133cfe7fe0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -413,6 +413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -414,6 +414,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end

patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 820bb37e9d9e670c2f8282967926dcce61852bf5..a3f717c6aacdae306a4c61b34d6aaaffa41f7c68 100644
+index 58c3ca0a917803e68701b6ac2ec193133cfe7fe0..9f6dfe81d1c1d1308505eb0d495d63e8b5be246a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4089,16 +4089,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4099,16 +4099,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index 820bb37e9d9e670c2f8282967926dcce61852bf5..a3f717c6aacdae306a4c61b34d6aaaff
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4106,14 +4108,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4116,14 +4118,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -128,7 +128,7 @@ index 820bb37e9d9e670c2f8282967926dcce61852bf5..a3f717c6aacdae306a4c61b34d6aaaff
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4135,9 +4184,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4145,9 +4194,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -25,10 +25,10 @@ index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2503af47e491d456e3044e097f35c928e45e5a21..cf95be6fcad6ad508d6ea1f6b10efa4e3bd2bfe5 100644
+index d31f52ace6dd6a80adb639e1e50f4b547b23103d..e88035e907b49983daafda61a3218cef1a34b2fb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2331,6 +2331,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2333,6 +2333,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
              return Optional.empty();
@@ -40,7 +40,7 @@ index 2503af47e491d456e3044e097f35c928e45e5a21..cf95be6fcad6ad508d6ea1f6b10efa4e
              Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c0b599b1835d28ddda3690b29f29bd8c6f03e215..6cc577d17201513af62ce847363ee25a3852a1b5 100644
+index f381bf9064be548a4a603e0042886d8a5e70ba5b..603d87fedf731498ebf516fdda3c785bd01bf830 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -322,6 +322,8 @@ public abstract class PlayerList {

patches/server/0051-Do-not-log-empty-message-warnings.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cf95be6fcad6ad508d6ea1f6b10efa4e3bd2bfe5..5fcca730767294e88445e701083c07c96d740147 100644
+index e88035e907b49983daafda61a3218cef1a34b2fb..5fe32932cce864997682b0d6b6b268074ba6f7c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -183,6 +183,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index cf95be6fcad6ad508d6ea1f6b10efa4e3bd2bfe5..5fcca730767294e88445e701083c07c9
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
-@@ -2539,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2541,7 +2542,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {

patches/server/0057-Do-not-log-Not-Secure-marker.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index 0f5cf192c0848bdeadeda381e19ec035455abfe5..04329cb72f6d42ca0967bd0a1d59ba56d80b8042 100644
+index 309fe1162db195c7c3c94d785d6aa2700e42b08a..e50b9ba2a711e6d05393b833342090bcfda2c93f 100644
 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerChatEvent;
@@ -18,7 +18,7 @@ index 0f5cf192c0848bdeadeda381e19ec035455abfe5..04329cb72f6d42ca0967bd0a1d59ba56
  
  import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection;
  
-@@ -351,7 +352,7 @@ public final class ChatProcessor {
+@@ -352,7 +353,7 @@ public final class ChatProcessor {
  
          private void sendToServer(final ChatType.Bound chatType, final @Nullable Function<Audience, net.minecraft.network.chat.Component> msgFunction) {
              final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console));
@@ -28,7 +28,7 @@ index 0f5cf192c0848bdeadeda381e19ec035455abfe5..04329cb72f6d42ca0967bd0a1d59ba56
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6cc577d17201513af62ce847363ee25a3852a1b5..8a59fade265e586622bcaa2cab2772613f9391aa 100644
+index 603d87fedf731498ebf516fdda3c785bd01bf830..05d35c0cddb2c647fff9d7238fa0f6ce7ddd520f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -100,6 +100,7 @@ import net.minecraft.world.scores.Objective;

patches/server/0073-Make-arrow-movement-resetting-despawn-counter-config.patch

@@ -42,10 +42,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index e7ef36dac559d03d127cf45373a7e0dc935b80a8..80b3f0a4ab3e57674a709ee9765df9710aa40bce 100644
+index 9788e477ff1446ad2ea3669922cc7dfc09900ce8..e615762a78dbf93584df5146939efa01a1e3bd7c 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -323,7 +323,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
          Vec3 vec3d = this.getDeltaMovement();
  
          this.setDeltaMovement(vec3d.multiply((double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F)));

patches/server/0075-Reduce-array-allocations.patch

@@ -479,7 +479,7 @@ index 89aaa846d5cb1cfd8ccf634f85bdc4180013cfd0..f69ea29648b090334d98dd8f3ed71cf8
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5fcca730767294e88445e701083c07c96d740147..2e82442846b275d4928a0905e4d5a4bbfa752d9b 100644
+index 5fe32932cce864997682b0d6b6b268074ba6f7c6..f9207ef2e6cc6d13c2b8f9eeb878c3f5c3e237ee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -28,6 +28,8 @@ import java.util.function.UnaryOperator;
@@ -541,7 +541,7 @@ index 5fcca730767294e88445e701083c07c96d740147..2e82442846b275d4928a0905e4d5a4bb
              return;
          }
          // Paper end
-@@ -3257,7 +3255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3259,7 +3257,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -588,7 +588,7 @@ index 3f7fab2f80ded9a7a720bd623f1ef028a4d0dca6..2ed3f42b1e487374287d033ac634a922
          final String s;
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b4c97cf1755e95bb8f2547d0b4def2d9e0834e8d..05eb03bb11b65ea09780b67926585aaf50581647 100644
+index f6b8e5d32b29f38301afb7e1b93de3d31c9fa774..0c1192cb92de739f96a188b9a0775337eb3f6e2c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -27,6 +27,8 @@ import java.util.UUID;
@@ -697,7 +697,7 @@ index 97ff19efa0b3943ccb7a6e02cba6ed2fea61adac..b2ae2bd8bd4ff3cb6457e8c08172e348
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c7b8c58a67a4e6f4a98730c7ef9f62072b788bc3..ffbf128d95a8e19758559cc03bb4beb2b3da038c 100644
+index 20f70e0bc085a941a7e5de3ceff968870f23fb5f..5c0c1100dc5bec3978f514f4403f9ee2c0352dc9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3102,7 +3102,7 @@ public abstract class LivingEntity extends Entity {

patches/server/0076-Optimize-sun-burn-tick.patch

@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 792d0724893a0ecc656408e6398b996e1d300f41..fa6bcab86726a874a2f3f565afc8364b51d876fc 100644
+index ca5b6a05ea3a3005d4a46f8581f498f6aadaee74..c8665f26723d315e09a96ff9a7e4688ce131a3e7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -290,7 +290,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,7 +25,7 @@ index 792d0724893a0ecc656408e6398b996e1d300f41..fa6bcab86726a874a2f3f565afc8364b
      public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
-@@ -1866,9 +1866,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1867,9 +1867,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {

patches/server/0098-Skip-entity-move-if-movement-is-zero.patch

@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa6bcab86726a874a2f3f565afc8364b51d876fc..92c9ccf9a05fe54b5c7e5a72da5498115a6d5bd9 100644
+index c8665f26723d315e09a96ff9a7e4688ce131a3e7..bf3bdbdb4384f374419f00635280305f84ce078c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index fa6bcab86726a874a2f3f565afc8364b51d876fc..92c9ccf9a05fe54b5c7e5a72da549811
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1021,6 +1022,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1022,6 +1023,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Paper end - detailed watchdog information
  
      public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index fa6bcab86726a874a2f3f565afc8364b51d876fc..92c9ccf9a05fe54b5c7e5a72da549811
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -3788,6 +3794,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3798,6 +3804,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch

@@ -13,10 +13,10 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92c9ccf9a05fe54b5c7e5a72da5498115a6d5bd9..d05e5b9b4dec0779489856dab5e50b53ff698c38 100644
+index bf3bdbdb4384f374419f00635280305f84ce078c..0ce745f5a00d4db68e8559fc1826dace52ae44d8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -868,7 +868,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -869,7 +869,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          this.checkOutOfWorld();
          if (!this.level.isClientSide) {

patches/server/0112-Send-multiple-keep-alive-packets.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e82442846b275d4928a0905e4d5a4bbfa752d9b..6faa4013b8a6b44d49f90decb4ad91ad585a3549 100644
+index f9207ef2e6cc6d13c2b8f9eeb878c3f5c3e237ee..87b3e7d235e6e05db4d4139125e5bdb2a0ee87f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -91,7 +91,7 @@ index 2e82442846b275d4928a0905e4d5a4bbfa752d9b..6faa4013b8a6b44d49f90decb4ad91ad
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3459,6 +3480,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3461,6 +3482,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

patches/server/0114-Make-max-interaction-distance-configurable.patch

@@ -20,7 +20,7 @@ index 58b093bb1de78ee3b3b2ea364aa50474883f443a..7be34e5df2b6d33c1d7943c9c0b6fd06
              this.debugLogging(pos, false, sequence, "too far");
          } else if (pos.getY() >= worldHeight) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6faa4013b8a6b44d49f90decb4ad91ad585a3549..171ee521040d1e971a39eac2a748937a41dcf6e5 100644
+index 87b3e7d235e6e05db4d4139125e5bdb2a0ee87f2..4aadf8dcb71ab98d01ff69077af93db98024fee4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -250,7 +250,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -55,7 +55,7 @@ index 6faa4013b8a6b44d49f90decb4ad91ad585a3549..171ee521040d1e971a39eac2a748937a
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2783,7 +2790,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2785,7 +2792,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  return;
              }
  

patches/server/0115-Load-portal-destination-chunk-before-entity-teleport.patch

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d05e5b9b4dec0779489856dab5e50b53ff698c38..2929669ae099482185f1abef60c569bf00b0597f 100644
+index 0ce745f5a00d4db68e8559fc1826dace52ae44d8..54dac74a5de4f967b3af7a63c8977d569a90157b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3446,6 +3446,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3456,6 +3456,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {

patches/server/0117-Don-t-load-chunks-to-activate-climbing-entities.patch

@@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2929669ae099482185f1abef60c569bf00b0597f..ce33630238ccd5cccaccc1e44f8077fff79550a8 100644
+index 54dac74a5de4f967b3af7a63c8977d569a90157b..71a2f7d6f4f737cb5f553bd06e588383f211633d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4304,6 +4304,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4314,6 +4314,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.feetBlockState;
      }
  
@@ -28,7 +28,7 @@ index 2929669ae099482185f1abef60c569bf00b0597f..ce33630238ccd5cccaccc1e44f8077ff
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b82786fa3ec2c42ed9f210548a15a551557466f8..717c677a69603809f377d37f4d3c37f71c09ab26 100644
+index e9554db6c331beec32ce11bb6a939bb909b1a877..714863ce4d401887119a6eab49a6c0413edb889d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1948,19 +1948,43 @@ public abstract class LivingEntity extends Entity {

patches/server/0132-For-collision-check-has-physics-before-same-vehicle.patch

@@ -16,10 +16,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ce33630238ccd5cccaccc1e44f8077fff79550a8..c2262201f66904036082a417a0c969bc3662747b 100644
+index 71a2f7d6f4f737cb5f553bd06e588383f211633d..a08c46c10630007a10e1dd1ba0c37ad25d847529 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1983,8 +1983,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1984,8 +1984,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {

patches/server/0133-Skip-negligible-planar-movement-multiplication.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c2262201f66904036082a417a0c969bc3662747b..bf436193595e49e704857c4e817f53b56a763e3f 100644
+index a08c46c10630007a10e1dd1ba0c37ad25d847529..5133905fbde6c507983554830413738dae09a269 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1187,9 +1187,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1188,9 +1188,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
  
                  this.tryCheckInsideBlocks();

patches/server/0143-Base-thread-pools.patch

@@ -1384,7 +1384,7 @@ index 37e0b6212fec71ec9662e6be3b1e8bea487eb4a6..251f098fa2203d06e5e5aa68a31a7653
                      for (Object o : worldData.cache.values() )
                      {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 171ee521040d1e971a39eac2a748937a41dcf6e5..f05d23e40a709b8da25531ecb8be125a82ffc04b 100644
+index 4aadf8dcb71ab98d01ff69077af93db98024fee4..aded21fa9948d79f7fc8fbe7d901da36e751cf5a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -187,6 +187,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -1510,7 +1510,7 @@ index 171ee521040d1e971a39eac2a748937a41dcf6e5..f05d23e40a709b8da25531ecb8be125a
          } else {
              Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
  
-@@ -2351,9 +2349,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2353,9 +2351,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}': {} > {}", this.player.getName().getString(), message, this.lastChatTimeStamp.get().getEpochSecond(), timestamp.getEpochSecond()); // Paper
@@ -1523,7 +1523,7 @@ index 171ee521040d1e971a39eac2a748937a41dcf6e5..f05d23e40a709b8da25531ecb8be125a
              return Optional.empty();
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
-@@ -3283,7 +3281,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3285,7 +3283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -1562,7 +1562,7 @@ index 4b3d2280326c7eeda4952c36edff141cbff90e16..fa3a58f09178604e301b107f1a029e59
  
      private static URL getEndpoint(URI root, @Nullable JsonObject endpoints, String key, String fallback) throws MalformedURLException {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1561ea392ce6fb35a01e407cb6fddab0c1942a1c..fe87ef6e0540bf81518fa01ca2c3516c95c2fb53 100644
+index ac12cde39125f3b9dc57f251dd124739422426f9..92a1a5cfc9f0ba2f2af7773e98794ec0e5db81f1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -15,7 +15,6 @@ import java.net.SocketAddress;