Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207)
PaperMC/Paper@a058ac0 Dolphin API (#7102)
PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334)
PaperMC/Paper@7978121 More PotionEffectType API (#5737)
PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
 
-paperCommit = 0a9602c4127beb7d8979d812bec0e587356d4bfb
+paperCommit = 9490475b02446b0839846c86fb52e4e27e0ab3a2
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..dc0535d5ea5b2f4002a428ec64ea52fe
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 51ec2e4ec4239659272bba3d6ba2ad73926ebb88..a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8 100644
+index c2c45a93887f99466a8ac4275355ac75c7f901c4..768cfcbf9b780a00aa93247ee43bd51eb636c2e7 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -802,4 +802,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -822,4 +822,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean isInPowderedSnow();
      // Paper end

patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -752,16 +752,19 @@ index ec8443b67014c0129256c9227cc89686422b9217..6b41e09d6ed075aae5455929b5b29efb
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Dolphin.java b/src/main/java/org/bukkit/entity/Dolphin.java
-index f00eaadcdde7ceef95def2d8ec6eb63a76c177bd..a4a645799d82c730e3280519facf1347d26a859f 100644
+index 8ab329946daaff25646f3dd4582feb9e4c0685ca..52c96388a05c31c05373e03dbb67c8d237f8d894 100644
 --- a/src/main/java/org/bukkit/entity/Dolphin.java
 +++ b/src/main/java/org/bukkit/entity/Dolphin.java
-@@ -1,3 +1,6 @@
- package org.bukkit.entity;
+@@ -2,6 +2,9 @@ package org.bukkit.entity;
+
+ import org.bukkit.Location;
 
 +/**
 + * Represents a dolphin
 + */
- public interface Dolphin extends WaterMob { }
+ public interface Dolphin extends WaterMob { // Paper start - Dolphin API
+
+     /**
 diff --git a/src/main/java/org/bukkit/entity/DragonFireball.java b/src/main/java/org/bukkit/entity/DragonFireball.java
 index 6c475a3723721b33bb7709d8c1bbf487a10f9bbe..210d955e9bbb669c8ce644c935c1607ae8e7419b 100644
 --- a/src/main/java/org/bukkit/entity/DragonFireball.java
@@ -787,10 +790,10 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..f76ddd80f9fc926f73b1cc50f0a2767a
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8..568836b589f4f81d8b3e715b39b90e5172215273 100644
+index 768cfcbf9b780a00aa93247ee43bd51eb636c2e7..5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -668,6 +668,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -688,6 +688,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      Pose getPose();
 
      // Spigot start
@@ -800,7 +803,7 @@ index a032bc5aaa0d7abffa9ec91fca397c47b2dac4a8..568836b589f4f81d8b3e715b39b90e51
      public class Spigot extends CommandSender.Spigot {
 
      }
-@@ -728,36 +731,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -748,36 +751,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
 
      /**
       * Check if entity is in rain

patches/api/0036-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 568836b589f4f81d8b3e715b39b90e5172215273..b2504a24ee2cc142f7b07fa5a908c0c693f18b8b 100644
+index 5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f..f0254799088d5343ef5c0c0a2841a6b51f17d14f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -849,5 +849,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -869,5 +869,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -2536,7 +2536,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..7ac51dbfce18a2bc52faa7a915abeccc
      int LARGE_MAX_STACK_SIZE = 64;
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0fab09101e 100644
+index 4584dcec835f97e94dcf12788b66703075dafe45..e0c91bc518168441fffa32f4c611a74800a8d2e2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -227,7 +227,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2548,7 +2548,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      public float yRot; // Paper - private->public
-@@ -348,6 +348,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -349,6 +349,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return this.originWorld;
      }
      // Paper end
@@ -2560,7 +2560,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -371,17 +376,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -372,17 +377,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
 
@@ -2598,7 +2598,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -390,6 +414,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -391,6 +415,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  range = passengerRange;
              }
          }
@@ -2608,7 +2608,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
 
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
-@@ -3860,16 +3887,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3867,16 +3894,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double speed) {
@@ -2634,7 +2634,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -3877,14 +3906,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3884,14 +3913,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2702,7 +2702,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -3906,9 +3982,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3913,9 +3989,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                                  // CraftBukkit end
                              }
                          }
@@ -2728,7 +2728,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..9bc568a2b0df13f55ee8670839b9e6a6
      public final String id;
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 44a32fd2c08a09af0bba01547847b8594a7cd077..eeef768b8a4235276812ac060da5505274688a57 100644
+index 25338fe4cfdc683ca4c01487e166a1649c6f640b..a6681690e1e556440320c492bf2a8e617008baa1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -139,7 +139,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;

patches/server/0003-Purpur-config-files.patch

@@ -172,7 +172,7 @@ index 55bae3efbc630be6d40d415509de4c3e744a5004..9d649923e28f4839106b336fce41bd3f
                          .withRequiredArg()
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee86dc14695
+index 0000000000000000000000000000000000000000..96802b86828522006d4a25ab61e6630173688679
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -0,0 +1,170 @@
@@ -250,8 +250,8 @@ index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee8
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 25);
-+        set("config-version", 25);
++        version = getInt("config-version", 26);
++        set("config-version", 26);
 +
 +        readConfig(PurpurConfig.class, null);
 +    }

patches/server/0005-Component-related-conveniences.patch

@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 04298bb935eacab6245afc0ae465ef0fab09101e..0f9758851ed05dd27496653cb0c00e6b0711a408 100644
+index e0c91bc518168441fffa32f4c611a74800a8d2e2..452d56e6e0c6682f0d55697b3e9e94d53e186f92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3650,6 +3650,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3657,6 +3657,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return SlotAccess.NULL;
      }
 

patches/server/0006-Ridables.patch

@@ -86,7 +86,7 @@ index 38de81f8696ed658d002427d002f22b28e3a6122..39bf75a7ba276f25e39573f084786dd5
                          if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((LivingEntity) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740ecaaf256 100644
+index 452d56e6e0c6682f0d55697b3e9e94d53e186f92..ab905ab075fd6966a95db45fc183d630bbf414ec 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -297,7 +297,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -98,7 +98,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2657,6 +2657,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2664,6 +2664,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  this.passengers = ImmutableList.copyOf(list);
              }
 
@@ -111,7 +111,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
          }
          return true; // CraftBukkit
      }
-@@ -2697,6 +2703,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2704,6 +2710,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  return false;
              }
              // Spigot end
@@ -126,7 +126,7 @@ index 0f9758851ed05dd27496653cb0c00e6b0711a408..622bc5a8e7e105ee9368f67be3ae7740
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4382,4 +4396,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -4389,4 +4403,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -201,7 +201,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..912767ed261e44c0192c5a07e2c20261
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index eeef768b8a4235276812ac060da5505274688a57..c7a6756521cc7c188910304f62a579b6724853e2 100644
+index a6681690e1e556440320c492bf2a8e617008baa1..67912e15aa060261b1ec2c13abcab309d6af8813 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -216,9 +216,9 @@ public abstract class LivingEntity extends Entity {
@@ -4923,10 +4923,10 @@ index 4759a6b3d3cd7973744562adf97d110d359ebce3..cfb43f277c013680a0e51fb93796e38f
 
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 69223b13e894d86d9529f2ef8b60a08a1f7a9267..c2581fb017f6579e59bd25e46b781aa95985abb2 100644
+index a3673e2943f251e056ecf84a9bff2de12efdb52a..e14754778ca53d30fdfe7c06e31b02f88a82b765 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1293,4 +1293,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1304,4 +1304,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
      // Paper end
@@ -4999,7 +4999,7 @@ index 519b17fac445b7118f5493508bddccd368dadcde..cd6db807c50f9b6269b54a69b6601837
              event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 720233b1dce48d23c5852765c8614ee86dc14695..85208c8d1058d46f3b2500efa752647138c74751 100644
+index 96802b86828522006d4a25ab61e6630173688679..ebdd323b4aa341b5adc84a6260b9f76222395fb4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -167,4 +167,9 @@ public class PurpurConfig {

patches/server/0049-Fix-the-dead-lagging-the-server.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27d95f88ef904402c1277818734310c9e37f9cde..ec4f6a2589999e1f2294f50742ece72236a9c7bd 100644
+index ab53a0d7f9a63d85e0c8d213b76a948ebb111b24..cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1769,6 +1769,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1770,6 +1770,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
          this.setYHeadRot(yaw); // Paper - Update head rotation
@@ -17,7 +17,7 @@ index 27d95f88ef904402c1277818734310c9e37f9cde..ec4f6a2589999e1f2294f50742ece722
 
      public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 726909f539a72bebacde7547d8dfabff0a2469e1..63561520a1e4ff37b5ba012dfffb01ad052c1b45 100644
+index 5d4c6f66d881525894ed8a3eac1aaadbc0d261c7..a7c7f3ac0e69f717ee37f9b840b04146661fcf67 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2930,7 +2930,7 @@ public abstract class LivingEntity extends Entity {

patches/server/0061-Configurable-void-damage-height-and-damage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ec4f6a2589999e1f2294f50742ece72236a9c7bd..bdafda2a5fd64dce2e13135fb932bfb0961b27eb 100644
+index cfa1e7eb6d1a4af2acb035dbe0852cdf62d87564..c1d6e5db593142188e3e7f4174bcaf5bd9b44527 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -815,7 +815,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -816,7 +816,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
 
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage
@@ -18,7 +18,7 @@ index ec4f6a2589999e1f2294f50742ece72236a9c7bd..bdafda2a5fd64dce2e13135fb932bfb0
              && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 63561520a1e4ff37b5ba012dfffb01ad052c1b45..08a7a0fcb64643969c334c26fa58f9ff74943640 100644
+index a7c7f3ac0e69f717ee37f9b840b04146661fcf67..bc97a1f4f7c81693ea2e9cc9b5d82a172033d230 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2422,7 +2422,7 @@ public abstract class LivingEntity extends Entity {

patches/server/0062-Add-canSaveToDisk-to-Entity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bdafda2a5fd64dce2e13135fb932bfb0961b27eb..6601e18fef636dcc8ea3bfa98c8a768066954ff8 100644
+index c1d6e5db593142188e3e7f4174bcaf5bd9b44527..f4395b55dac3b6a5501fbe8c88006a008af0fde3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4437,5 +4437,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -4444,5 +4444,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public boolean processClick(InteractionHand hand) {
          return false;
      }

patches/server/0092-Stop-squids-floating-on-top-of-water.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6601e18fef636dcc8ea3bfa98c8a768066954ff8..8a70a018d3b3942e412f1b6ca0ecc11355ec8759 100644
+index f4395b55dac3b6a5501fbe8c88006a008af0fde3..bc89ad23c1ec02a1f5a1e03b3f6f9982cc0fa1f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3929,6 +3929,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3936,6 +3936,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.yRotO = this.getYRot();
      }