Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20.1-R0.1-SNAPSHOT
 
 mcVersion=1.20.1
-paperRef=281855c877cf4e78a8a4918c5d89cdab2c5c0861
+paperRef=3716832282a136dbbd29ab04d1a37ae88ac3726e
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0008-Gale-semantic-version.patch

@@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb
          }
 diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b226b2aea6b1c002e3b9242e3d20c08a50a7ab80
+index 0000000000000000000000000000000000000000..97fd440ec0f9389a6886f2a1b71ae380bbb85575
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
 @@ -0,0 +1,37 @@
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..b226b2aea6b1c002e3b9242e3d20c08a
 +     * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
 +     * such as bug fixes, performance improvements or changes in wording.
 +     */
-+    public static final @NotNull String version = "0.6.1";
++    public static final @NotNull String version = "0.6.2";
 +
 +    /**
 +     * The "<code>major.minor</code>" portion of the {@link #version}.

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

@@ -883,7 +883,7 @@ index 161c40692e8d469fad4169908b9353be0f85d0d8..2622ee60f839f2af896fbf5d97400551
                  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 e8923befdee3514be5346c6e6c8e7236e7e6e668..afe336563a748c80c09e693ad6b63d8b55ffa2ca 100644
+index 3c0651fa5a5db880202c9a3805a6455269c5f16d..c513978f5de138353ca32e264cc5b06ba664a041 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -397,7 +397,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -979,10 +979,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 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c650afd917a 100644
+index e8485fb900b25e911a858678a833852731cb2ace..6a3b3370eb0c2670c13e3133ac86a9b107eae37b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -809,7 +809,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -811,7 +811,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
  
      public void baseTick() {
@@ -990,7 +990,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
          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()) {
-@@ -870,7 +869,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -872,7 +871,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
  
          this.firstTick = false;
@@ -998,7 +998,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
      }
  
      public void setSharedFlagOnFire(boolean onFire) {
-@@ -1089,7 +1087,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1091,7 +1089,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
              }
  
@@ -1006,7 +1006,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
                  this.stuckSpeedMultiplier = Vec3.ZERO;
-@@ -1098,7 +1095,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1100,7 +1097,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);
@@ -1014,7 +1014,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
                  return;
              }
              // Paper end
-@@ -1119,8 +1115,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1121,8 +1117,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
              }
  
@@ -1023,7 +1023,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
              boolean flag = !Mth.equal(movement.x, vec3d1.x);
              boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
  
-@@ -1138,9 +1132,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1140,9 +1134,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              BlockState iblockdata = this.level().getBlockState(blockposition);
  
              this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
@@ -1034,7 +1034,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
                  if (this.horizontalCollision) {
                      Vec3 vec3d2 = this.getDeltaMovement();
  
-@@ -1276,8 +1268,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1278,8 +1270,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) {
                      this.setRemainingFireTicks(-this.getFireImmuneTicks());
                  }
@@ -1043,7 +1043,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
              }
          }
          // Paper start - detailed watchdog information
-@@ -3028,7 +3018,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3030,7 +3020,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
  
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1051,7 +1051,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
                      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);
-@@ -3046,7 +3035,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3048,7 +3037,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
                      } // Paper
                      // CraftBukkit end
@@ -1059,7 +1059,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
                  }
  
                  this.isInsidePortal = false;
-@@ -3517,14 +3505,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3519,14 +3507,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          }
          // Paper end
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -1074,7 +1074,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
              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) {
-@@ -3563,7 +3549,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3565,7 +3551,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.unRide();
                  // CraftBukkit end
  
@@ -1082,7 +1082,7 @@ index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c65
                  // Paper start - Change lead drop timing to prevent dupe
                  if (this instanceof Mob) {
                      ((Mob) this).dropLeash(true, true); // Paper drop lead
-@@ -3586,10 +3571,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3588,10 +3573,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
  
                  this.removeAfterChangingDimensions();

patches/server/0028-Remove-iterators-from-Inventory-contains.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/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-index 395cecc385e4126a7534ac9aeb15cf323efab03e..cbcbb826733cf75bb018752af75a6a338947c472 100644
+index 96d664c28738d6090f7067761c2978dd1aa0fd0e..e89942d80b435acbeb7a1d00491c7fdf18e89a3c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-@@ -681,6 +681,8 @@ public class Inventory implements Container, Nameable {
+@@ -687,6 +687,8 @@ public class Inventory implements Container, Nameable {
      }
  
      public boolean contains(ItemStack stack) {
@@ -43,7 +43,7 @@ index 395cecc385e4126a7534ac9aeb15cf323efab03e..cbcbb826733cf75bb018752af75a6a33
          Iterator iterator = this.compartments.iterator();
  
          while (iterator.hasNext()) {
-@@ -695,7 +697,18 @@ public class Inventory implements Container, Nameable {
+@@ -701,7 +703,18 @@ public class Inventory implements Container, Nameable {
                  }
              }
          }

patches/server/0041-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 be9ac3b5b1107f588f6c00e7768a883691a8adcb..32ec0620e9d8c900df5ce78c1ff5f306bff969d2 100644
+index 6a3b3370eb0c2670c13e3133ac86a9b107eae37b..d57d9ddaa5b866700307cd6d4ee4b594d0c7c257 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -507,17 +507,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -508,17 +508,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -73,7 +73,7 @@ index be9ac3b5b1107f588f6c00e7768a883691a8adcb..32ec0620e9d8c900df5ce78c1ff5f306
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -526,6 +546,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -527,6 +547,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }

patches/server/0043-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 32ec0620e9d8c900df5ce78c1ff5f306bff969d2..14ce63f8fbac2214f1653a5388043de0420d7223 100644
+index d57d9ddaa5b866700307cd6d4ee4b594d0c7c257..a898435f4ba3ab182150d38657be8208cdca9e01 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -433,6 +433,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -434,6 +434,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end

patches/server/0045-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 909e641b94b1a6516171a09df514848cf3c3082e..fb43c428813d05f047a801cff8a2682499a03208 100644
+index a898435f4ba3ab182150d38657be8208cdca9e01..d751b3ce631527c2e65e649b56880fe0330c07e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4288,16 +4288,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4290,16 +4290,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index 909e641b94b1a6516171a09df514848cf3c3082e..fb43c428813d05f047a801cff8a26824
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4305,14 +4307,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4307,14 +4309,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -128,7 +128,7 @@ index 909e641b94b1a6516171a09df514848cf3c3082e..fb43c428813d05f047a801cff8a26824
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4334,9 +4383,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4336,9 +4385,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0047-Make-book-writing-configurable.patch

@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
 functionality before additional exploits are found.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index afe336563a748c80c09e693ad6b63d8b55ffa2ca..3340aba4f44049407ce273bf73ff2cdf87dc7ed9 100644
+index c513978f5de138353ca32e264cc5b06ba664a041..376f277863a8e7a2f31ec6b013425e11bc719571 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -184,6 +184,8 @@ import net.minecraft.world.phys.Vec3;
@@ -34,7 +34,7 @@ index afe336563a748c80c09e693ad6b63d8b55ffa2ca..3340aba4f44049407ce273bf73ff2cdf
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -1224,6 +1226,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1231,6 +1233,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {

patches/server/0050-Make-chat-order-verification-configurable.patch

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3340aba4f44049407ce273bf73ff2cdf87dc7ed9..ceb9692958010e73969ea97731c8ce2f04a73b3f 100644
+index 376f277863a8e7a2f31ec6b013425e11bc719571..cacf0de71e3a84a18213628764c2a7b4c0a43781 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2418,6 +2418,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2425,6 +2425,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
  
      private boolean updateChatOrder(Instant timestamp) {

patches/server/0051-Dragon-respawn-end-crystal-proximity-check.patch

@@ -20,10 +20,10 @@ index ca1edc083847b47bb450b291723aca778a5912dc..428eed6ad35b59bdf293ca727fa3e815
                      }
  
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 02d5a5b799bfe90993bc6868369d31f43d5b7fd6..9cb6a36ac210574a3d62202b16058e9fdc94691e 100644
+index 630971d7a87c12798672af9635535eaf80a3ec9c..060473abbeb9e0cae97e0c48cd480a300970ffa6 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -535,6 +535,12 @@ public class EndDragonFight {
+@@ -553,6 +553,12 @@ public class EndDragonFight {
      }
  
      public boolean tryRespawn() { // CraftBukkit - return boolean
@@ -36,7 +36,7 @@ index 02d5a5b799bfe90993bc6868369d31f43d5b7fd6..9cb6a36ac210574a3d62202b16058e9f
          if (this.dragonKilled && this.respawnStage == null) {
              BlockPos blockposition = this.portalLocation;
  
-@@ -552,6 +558,22 @@ public class EndDragonFight {
+@@ -570,6 +576,22 @@ public class EndDragonFight {
                  blockposition = this.portalLocation;
              }
  

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

@@ -25,10 +25,10 @@ index 2622ee60f839f2af896fbf5d974005518247a5f5..52f6a56f9290fa0fb6537842c9fefe45
      // 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 ceb9692958010e73969ea97731c8ce2f04a73b3f..cbc086e94e2327852880c3c4fcd55bd6d8660ecd 100644
+index cacf0de71e3a84a18213628764c2a7b4c0a43781..315128d7bcd73ed108f2ae6d7c05b6bec1d8773d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2395,6 +2395,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2402,6 +2402,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
                  this.send(new ClientboundSystemChatPacket(PaperAdventure.asAdventure(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), false)); // Paper - Adventure
                  return Optional.empty();

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

@@ -7,7 +7,7 @@ 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/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cbc086e94e2327852880c3c4fcd55bd6d8660ecd..904284eebdc51360f0a8bc2015efb62fe20a4c70 100644
+index 315128d7bcd73ed108f2ae6d7c05b6bec1d8773d..6df1e15af01b694964d1f76330b720ff528253af 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -185,6 +185,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index cbc086e94e2327852880c3c4fcd55bd6d8660ecd..904284eebdc51360f0a8bc2015efb62f
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
-@@ -2601,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2608,7 +2609,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {

patches/server/0067-Do-not-log-out-of-order-message-warnings.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/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 904284eebdc51360f0a8bc2015efb62fe20a4c70..451b26fb1bda92872e31c62d0ce352c68215320b 100644
+index 6df1e15af01b694964d1f76330b720ff528253af..3bb1b56fc189c0fc3aca2a65155e5ea5eadc7a87 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2385,7 +2385,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2392,7 +2392,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
          if (!this.updateChatOrder(timestamp)) {

patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -37,10 +37,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/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index d9baa85962236c42219cf09d4f3129be93ff069c..414a47a82927bed02a4f3cf330c78e46f1d66782 100644
+index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..5f8e169a6e80e8f05df251fa76e60f512508d385 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -178,6 +178,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -177,6 +177,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
  
      public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
          if (world instanceof ServerLevel && !blockEntity.isCoolingDown()) {

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

@@ -469,7 +469,7 @@ index efbc8483a51c5272ca81747c82dc65e7f0f5c232..9879599c38db4f3332c347b6b0c26034
          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 451b26fb1bda92872e31c62d0ce352c68215320b..4c3cc426978be322efc9e051e048c2192bbdc221 100644
+index 3bb1b56fc189c0fc3aca2a65155e5ea5eadc7a87..76bea01e27d4e77296237998f0783565b1c3d1c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
@@ -531,7 +531,7 @@ index 451b26fb1bda92872e31c62d0ce352c68215320b..4c3cc426978be322efc9e051e048c219
              return;
          }
          // Paper end
-@@ -3357,7 +3355,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3364,7 +3362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {

patches/server/0086-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 1e43237008827538773d3299778d6778bee4049b..ef85df48cfac8af3c15df0d686eea73c1346423c 100644
+index 19d05bfec4aafdf3712ad24b4b29a9f55067e578..1b0a01a120bc02d82263ac2753dc8447e77b57fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -25,7 +25,7 @@ index 1e43237008827538773d3299778d6778bee4049b..ef85df48cfac8af3c15df0d686eea73c
      public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
-@@ -2005,9 +2005,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2007,9 +2007,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {

patches/server/0107-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 ef85df48cfac8af3c15df0d686eea73c1346423c..38e24fbc55d36d1e5529e3ff0315b2408cdb99a9 100644
+index 1b0a01a120bc02d82263ac2753dc8447e77b57fd..850499786e72dd5e9e8b173f9203c64cb8d5f4a5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,7 +24,7 @@ index ef85df48cfac8af3c15df0d686eea73c1346423c..38e24fbc55d36d1e5529e3ff0315b240
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1088,6 +1089,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1090,6 +1091,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 ef85df48cfac8af3c15df0d686eea73c1346423c..38e24fbc55d36d1e5529e3ff0315b240
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -3980,6 +3986,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3982,6 +3988,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {

patches/server/0112-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 38e24fbc55d36d1e5529e3ff0315b2408cdb99a9..0b22993d2f6bdc6a096626ae76dac2433293fa14 100644
+index 850499786e72dd5e9e8b173f9203c64cb8d5f4a5..7fe7112145dbd46d851db3fc9ed183f5fdef24fe 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -890,7 +890,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -892,7 +892,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          this.checkBelowWorld();
          if (!this.level().isClientSide) {

patches/server/0118-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 4c3cc426978be322efc9e051e048c2192bbdc221..2fe85168935d2b558fd33a9f5b53dc1c1d5024f2 100644
+index 76bea01e27d4e77296237998f0783565b1c3d1c8..819909fcb754b511fb9932926f73675a02dafbab 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 4c3cc426978be322efc9e051e048c2192bbdc221..2fe85168935d2b558fd33a9f5b53dc1c
          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
-@@ -3549,6 +3570,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3556,6 +3577,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

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

@@ -7,7 +7,7 @@ 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/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..98b5efcea7d54a8132aab84d1de2d1f799556436 100644
+index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..8e851f6f5d72f3d1d35d5e0a9bcabaf4f5a227a1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -174,7 +174,7 @@ public class ServerPlayerGameMode {
@@ -20,7 +20,7 @@ index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..98b5efcea7d54a8132aab84d1de2d1f7
              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 2fe85168935d2b558fd33a9f5b53dc1c1d5024f2..249f3b7671d4d5c6072b256afdec31ce948bd306 100644
+index 819909fcb754b511fb9932926f73675a02dafbab..8171385688405d9f3263c099177bd92e92d55c38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -46,7 +46,7 @@ index 2fe85168935d2b558fd33a9f5b53dc1c1d5024f2..249f3b7671d4d5c6072b256afdec31ce
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -2017,7 +2024,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2024,7 +2031,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              BlockPos blockposition = movingobjectpositionblock.getBlockPos();
              Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
  
@@ -55,7 +55,7 @@ index 2fe85168935d2b558fd33a9f5b53dc1c1d5024f2..249f3b7671d4d5c6072b256afdec31ce
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2881,7 +2888,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2888,7 +2895,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
              AABB axisalignedbb = entity.getBoundingBox();
  

patches/server/0121-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 0b22993d2f6bdc6a096626ae76dac2433293fa14..ccb2722e8025b97d972cafac5258676cb4a29390 100644
+index 7fe7112145dbd46d851db3fc9ed183f5fdef24fe..286356ccb4f6938a857a58d4478f00aa84f00ee1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3601,6 +3601,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3603,6 +3603,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {

patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.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 706b9606e17f10376a7ed96a829ff49d43dd7387..2689e7006e7350db206c2401344f01a0f09ba6bc 100644
+index 286356ccb4f6938a857a58d4478f00aa84f00ee1..206f8e45b3ba1c0b1f25246b61cb6a2d7fe0a0fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4507,6 +4507,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4509,6 +4509,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.feetBlockState;
      }
  

patches/server/0137-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 ffb0e9a5c24d7c95f1cc1fe495ac4d76c6362eb8..1c690cf8cd867b6ab709ffb344c84167d63802db 100644
+index 206f8e45b3ba1c0b1f25246b61cb6a2d7fe0a0fd..cb916c50c27cf76d223921dca9302caa36a5e173 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2122,8 +2122,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2124,8 +2124,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {

patches/server/0138-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 1c690cf8cd867b6ab709ffb344c84167d63802db..63be939e2efe2de7a8e2e50e711d59b5e0db0ce5 100644
+index cb916c50c27cf76d223921dca9302caa36a5e173..5872824b58d65208f21379ebd4fca918da323c32 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1251,9 +1251,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1253,9 +1253,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
  
                  this.tryCheckInsideBlocks();

patches/server/0143-Reduce-RandomSource-instances.patch

@@ -109,10 +109,10 @@ index 8f2c0dcb0ca69ea1b09bb055c6a9494980be8e92..2a7813209d664fd8c123488ce9c530b4
          this.hitPlayers = Maps.newHashMap();
          this.level = world;
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 414a47a82927bed02a4f3cf330c78e46f1d66782..cc17cb985856fd8d1083b5b1f57f82c651d28443 100644
+index 5f8e169a6e80e8f05df251fa76e60f512508d385..6569efea988243729af2c0df8d15edc848e95c13 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -361,7 +361,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -360,7 +360,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
      }
  
      private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) {
@@ -122,10 +122,10 @@ index 414a47a82927bed02a4f3cf330c78e46f1d66782..cc17cb985856fd8d1083b5b1f57f82c6
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 9cb6a36ac210574a3d62202b16058e9fdc94691e..51a3188f4873666100ba438550efa76e59342afd 100644
+index 060473abbeb9e0cae97e0c48cd480a300970ffa6..c8f75bf68c4787e4ba711cbf44c4524484c3d7c3 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -454,7 +454,7 @@ public class EndDragonFight {
+@@ -472,7 +472,7 @@ public class EndDragonFight {
          this.level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
              return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
          }).ifPresent((holder_c) -> {
@@ -134,7 +134,7 @@ index 9cb6a36ac210574a3d62202b16058e9fdc94691e..51a3188f4873666100ba438550efa76e
          });
      }
  
-@@ -472,7 +472,7 @@ public class EndDragonFight {
+@@ -490,7 +490,7 @@ public class EndDragonFight {
              this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
          }
          // Paper end