Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

gradle.properties

@@ -4,7 +4,7 @@ version = 1.20.4-R0.1-SNAPSHOT
 mcVersion = 1.20.4
 
 # Upstream commit
-purpurCommit = 04ee5e7c2831439b9816fb8cc00afff591b2c66c
+purpurCommit = d05e78bdb143883e03cb17df96fee1f05f60cada
 
 # Gradle
 org.gradle.caching = true

patches/api/0014-Kiterino-NamespacedKey.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Kiterino NamespacedKey
 
 
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..bb833ecc01ec06a865a2474548d07e7eaf9c679f 100644
+index 95bc1078e35a92624b6627e78ed80080832d1b57..9ba8224bafb35584650b6a467546f02df7b3cd58 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
 @@ -30,6 +30,12 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
@@ -21,7 +21,7 @@ index 8ac72cb0b05e2c493d98310f2e87c3714d15c5e3..bb833ecc01ec06a865a2474548d07e7e
      //
      private final String namespace;
      private final String key;
-@@ -180,6 +186,19 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
+@@ -176,6 +182,19 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
          return new NamespacedKey(MINECRAFT, key);
      }
 

patches/server/0015-Origami-Keep-weather-clear-after-sleep.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Origami - Keep weather clear after sleep
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dd0ef00d29d4caa3a1fe8513ec82d72f64fc308f..6512e2179d68115679dafd5e4ac9144d7ed4cb21 100644
+index ac3e1d0f5b8def2bdace6f3b680ff9e929c515fb..5d37e72f4af2b6c318c67dd16916e4f6c39032c9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1400,6 +1400,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1405,6 +1405,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
      @VisibleForTesting
      public void resetWeatherCycle() {

patches/server/0023-Allow-sleeping-anytime-and-anywhere.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow sleeping anytime and anywhere
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6512e2179d68115679dafd5e4ac9144d7ed4cb21..98a79b7e0a04d8f01cd46ed69f02cfa35fa7f5ff 100644
+index 5d37e72f4af2b6c318c67dd16916e4f6c39032c9..c74a8df4502b4067024daf4ae441a720b819d11e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -850,8 +850,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -855,8 +855,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  if (!event.isCancelled()) {
                      this.setDayTime(this.getDayTime() + event.getSkipAmount());
                  }
@@ -28,7 +28,7 @@ index 6512e2179d68115679dafd5e4ac9144d7ed4cb21..98a79b7e0a04d8f01cd46ed69f02cfa3
              if (!event.isCancelled()) {
                  this.wakeUpAllPlayers();
              }
-@@ -859,6 +870,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -864,6 +875,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
                  this.resetWeatherCycle();
              }
@@ -37,10 +37,10 @@ index 6512e2179d68115679dafd5e4ac9144d7ed4cb21..98a79b7e0a04d8f01cd46ed69f02cfa3
 
          this.updateSkyBrightness();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b4949fc39b6bd4be83ef925ea9f1253cf492cdd4..234832a5b76451c0e84b292188dc6a34311b74f0 100644
+index b107ac51f5c01a1ae1378612b1472c3295379768..dc17a8b118ba00b9d8e3f1af49fc346f06b5ccdf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1423,6 +1423,7 @@ public class ServerPlayer extends Player {
+@@ -1424,6 +1424,7 @@ public class ServerPlayer extends Player {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
                  this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.BED); // Paper - PlayerSetSpawnEvent
@@ -49,7 +49,7 @@ index b4949fc39b6bd4be83ef925ea9f1253cf492cdd4..234832a5b76451c0e84b292188dc6a34
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f1fe8a0c1ff1514d9a158e18dc6d234d54388573..a53618e21197b9c54527b9c480c0c506af88d5da 100644
+index 738aca99196c5b88ed5d561d410964c71625578d..3c730b3603aab78aa0981015e739cb133a9f8199 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -287,7 +287,7 @@ public abstract class Player extends LivingEntity {

patches/server/0042-Observers-detect-entities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Observers detect entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1e6a65970a64eed30a0917b9e30162dc7e2817c0..18945c86ef09313b34f9485267960a2166ef28bc 100644
+index ceddda7ddb1a3b1e7c6e5b9f6887bd12d8584e89..13db4b85ef0f7943f3c4dd3bc47b976494d26188 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1318,6 +1318,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1322,6 +1322,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
 
                  //this.level().getProfiler().pop(); // Purpur
              }

patches/server/0051-Add-block-place-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add block place API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 257ad0205579740bda9416bfaed9bc28424cf869..b55e6ab1094c38e544513da9c9cb5cf6844706d7 100644
+index 0122902b0949d8e8b87b0ef1e98359be0b1568a2..116643d751b36bf41c84045867e7328c7ed66b8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3464,4 +3464,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3470,4 +3470,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
      }
      // Purpur end

patches/server/0058-Client-kick-message-API.patch

@@ -47,10 +47,10 @@ index da499e0b21eba40d24d95047e3a9220567d4bae7..d43c695c809a36495b63a9eeece02213
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b55e6ab1094c38e544513da9c9cb5cf6844706d7..2cb8c43b7ad3de04a2aaf6a8ab6757be189c208d 100644
+index 116643d751b36bf41c84045867e7328c7ed66b8f..7dab81c7fae682ec20d859756b8ac1a483477c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3496,5 +3496,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3502,5 +3502,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
          return true;
      }

patches/server/0061-Allow-setting-entity-s-rider.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow setting entity's rider
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 18945c86ef09313b34f9485267960a2166ef28bc..402778b86dff000aab145cb30a3d42ff041706f3 100644
+index 13db4b85ef0f7943f3c4dd3bc47b976494d26188..9f1a01220e25f8a0da2e4e5831806358607ee59e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3073,6 +3073,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3077,6 +3077,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
      }
 
@@ -30,7 +30,7 @@ index 18945c86ef09313b34f9485267960a2166ef28bc..402778b86dff000aab145cb30a3d42ff
      protected boolean removePassenger(Entity entity) { return removePassenger(entity, false);}
      protected boolean removePassenger(Entity entity, boolean suppressCancellation) { // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index f364674b35bf22f50ada5931065faba287fa541d..ba67d69d1cda2b22431642c3c4e7efbd789d8b55 100644
+index 8ca0d6f2a5565f83a7bc5ecc7ccd9ff5ae7079c5..49233d48c00c76ec5fa4391caa8668cfefcff05f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1823,7 +1823,7 @@ public abstract class Mob extends LivingEntity implements Targeting {

patches/server/0064-Fix-entity-serialization.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 402778b86dff000aab145cb30a3d42ff041706f3..2b2638bd3fcb37ab2f4e21145dc3ffe5983100f2 100644
+index 9f1a01220e25f8a0da2e4e5831806358607ee59e..612fce2a325f27e0d2dd1bca53cd95c1236fb503 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2359,15 +2359,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2363,15 +2363,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
      }
 

patches/server/0065-Spawning-player-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawning player API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2b2638bd3fcb37ab2f4e21145dc3ffe5983100f2..a45ade021825f7f6753eb4df200a0b516161e431 100644
+index 612fce2a325f27e0d2dd1bca53cd95c1236fb503..6f118c8f1534ec8bcd09738bb557aa5d248eca72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -449,6 +449,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -36,7 +36,7 @@ index 2b2638bd3fcb37ab2f4e21145dc3ffe5983100f2..a45ade021825f7f6753eb4df200a0b51
      public boolean isChunkLoaded() {
          return this.level.hasChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4);
      }
-@@ -2525,6 +2546,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2529,6 +2550,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
              }
              // Purpur end
@@ -48,7 +48,7 @@ index 2b2638bd3fcb37ab2f4e21145dc3ffe5983100f2..a45ade021825f7f6753eb4df200a0b51
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2677,6 +2703,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2681,6 +2707,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  immuneToFire = nbt.getBoolean("Purpur.FireImmune");
              }
              // Purpur end
@@ -73,7 +73,7 @@ index a2a59dd2e515bf4dca84a442703c122fd36f05e0..d8246fc22c4fef2f80988daddb80204d
                                              // CraftBukkit start
                                              // SPIGOT-7045: Give ocelot babies back their special spawn reason. Note: This is the only modification required as ocelots count as monsters which means they only spawn during normal chunk ticking and do not spawn during chunk generation as starter mobs.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2f418e3809e97f93ed09a8660dbb22e1b796b024..68d12d4ac69a0ec6bd798ecba9d6576f5a400f57 100644
+index be78915fd1a8cdd0b7f5109b45087fd1b2220f97..99589c948c7c0e3e8a56971315658d8bedffd11a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1282,4 +1282,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0074-Tweak-minecart-off-rail-velocity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Tweak minecart off rail velocity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a45ade021825f7f6753eb4df200a0b516161e431..e66ad73e22a1dd2dff39bce155b0c07cfa485c52 100644
+index 6f118c8f1534ec8bcd09738bb557aa5d248eca72..23d9a112d2d25602b0ebdc76f6c1451e7c4460d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1525,7 +1525,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1529,7 +1529,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return offsetFactor;
      }
 

patches/server/0077-Include-vehicle-s-height-in-collision.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Include vehicle's height in collision
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e66ad73e22a1dd2dff39bce155b0c07cfa485c52..da978ae625f36d7cbfcd2c8c6d167bd7b1186a60 100644
+index 23d9a112d2d25602b0ebdc76f6c1451e7c4460d7..72279d822bfe6f34c70d97148c6e2346b2f4fd08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1535,7 +1535,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1539,7 +1539,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
 
          final Level world = this.level;
@@ -22,7 +22,7 @@ index e66ad73e22a1dd2dff39bce155b0c07cfa485c52..da978ae625f36d7cbfcd2c8c6d167bd7
 
          if (io.papermc.paper.util.CollisionUtil.isEmpty(currBoundingBox)) {
              return movement;
-@@ -1597,10 +1602,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1601,10 +1606,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  return vec3d2.add(io.papermc.paper.util.CollisionUtil.performCollisions(new Vec3(0.0D, -vec3d2.y + movement.y, 0.0D), currBoundingBox.move(vec3d2), potentialCollisionsVoxel, potentialCollisionsBB));
              }
 

patches/server/0078-Mob-possessing-mechanic-compatibility.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Mob possessing mechanic compatibility
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index da978ae625f36d7cbfcd2c8c6d167bd7b1186a60..a0fbf68a47ab4a03ab9a5a7341be31eb8d4fda00 100644
+index 72279d822bfe6f34c70d97148c6e2346b2f4fd08..ddcdd055e552f35aa1117c71f98bd513b88127a4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1537,7 +1537,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1541,7 +1541,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          final Level world = this.level;
          // Kiterino start - include vehicle's height in collision
          AABB currBoundingBox = this.getBoundingBox();
@@ -17,7 +17,7 @@ index da978ae625f36d7cbfcd2c8c6d167bd7b1186a60..a0fbf68a47ab4a03ab9a5a7341be31eb
              currBoundingBox = new AABB(currBoundingBox.minX, getVehicle().getBoundingBox().minY + 0.1, currBoundingBox.minZ, currBoundingBox.maxX, currBoundingBox.maxY, currBoundingBox.maxZ);
          }
          // Kiterino end
-@@ -1605,6 +1605,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1609,6 +1609,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
          // Kiterino start - include vehicle's height in collision
          for (Entity passenger : getPassengers()) {

patches/server/0079-Collision-based-landing-pos.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Collision based landing pos
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0fbf68a47ab4a03ab9a5a7341be31eb8d4fda00..1ff2ee4d9064d20a469781a0f05fe9fd6ad592c8 100644
+index ddcdd055e552f35aa1117c71f98bd513b88127a4..44bbb2ae3f9c00dd22b649b226d31773531747b5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1439,6 +1439,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1443,6 +1443,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      /** @deprecated */
      @Deprecated
      public BlockPos getOnPosLegacy() {

patches/server/0088-Fix-MC-2025.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-2025
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1ff2ee4d9064d20a469781a0f05fe9fd6ad592c8..50d6a838b223e9c0f678731d64d2483c616b642f 100644
+index 44bbb2ae3f9c00dd22b649b226d31773531747b5..79788625d4dc73b00c480a8ca4f5b0c1542d64a0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2578,6 +2578,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2582,6 +2582,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  nbttagcompound.putUUID("Kiterino.SpawningPlayerUUID", spawningPlayerUuid);
              }
              // Kiterino end
@@ -28,7 +28,7 @@ index 1ff2ee4d9064d20a469781a0f05fe9fd6ad592c8..50d6a838b223e9c0f678731d64d2483c
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2655,6 +2668,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2659,6 +2672,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                          this.reapplyPosition();
                      }
 

patches/server/0090-Fix-MC-145311-consider-entities-in-water-cauldrons-b.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-145311 - consider entities in water cauldrons being
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 50d6a838b223e9c0f678731d64d2483c616b642f..3f1e30330145dd688af21281a20fe6e143098cde 100644
+index 79788625d4dc73b00c480a8ca4f5b0c1542d64a0..6bbd2d53672bfd59a5e64ac5a244225f489fb28f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1936,6 +1936,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1940,6 +1940,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.isInWaterOrBubble() || this.isInLava();
      }
 
@@ -28,7 +28,7 @@ index 50d6a838b223e9c0f678731d64d2483c616b642f..3f1e30330145dd688af21281a20fe6e1
      public boolean isUnderWater() {
          return this.wasEyeInWater && this.isInWater();
      }
-@@ -1970,7 +1982,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1974,7 +1986,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
          }