Update Paper

gradle.properties

@@ -4,4 +4,4 @@ version=1.19.2-R0.1-SNAPSHOT
 mcVersion=1.19.2
 packageVersion=1_19_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=77a50b95dada2d73b92fdd95d674d357b64bc7d4
+paperRef=3dcfec4499ce2ab3d8c775c7795a6283f8647242

patches/server/0005-Fix-gravity-block-duper.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..efa899ed25ab0a09d9d6a6fc88c02f54bc3aef40 100644
+index a1421689445b9df3f25889845c21cf37a439afe2..e0cc8171151f9db0d4b29980f097f81cacfe9718 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -511,36 +511,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -510,36 +510,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
      // Paper end - optimise entity tracking
@@ -46,7 +46,7 @@ index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..efa899ed25ab0a09d9d6a6fc88c02f54
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2900,7 +2872,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2898,7 +2870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
@@ -56,7 +56,7 @@ index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..efa899ed25ab0a09d9d6a6fc88c02f54
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index ef07967b64180c54338b8fb2ba1780adec87f333..0df9c67c22af9fafc5a6f850f017ae3aa01e91b4 100644
+index b2d1a17867cdbaad0c6e5c2376c716f9461af124..76bf5ec58d93164b5eeed63b5dae8a5d39ef15e0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -61,7 +61,7 @@ public class FallingBlockEntity extends Entity {
@@ -93,7 +93,7 @@ index ef07967b64180c54338b8fb2ba1780adec87f333..0df9c67c22af9fafc5a6f850f017ae3a
 +			// Leaves - fix gravity block duper
  
              // Paper start - Configurable EntityFallingBlock height nerf
-             if (this.level.paperConfig().fixes.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig().fixes.fallingBlockHeightNerf) {
+             if (this.level.paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 index 15c5cccfe02c924c02f605eb47dd0b420b189891..d3b286e145c7eda30f3e2419d20feee107a4f42f 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java

patches/server/0006-Fix-trading-with-the-void.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f1a27e0ea0569438032ff6c5a777a35be4e501ef..e310660e50867715dfcce041d7c8d4904a7dca12 100644
+index f1a1c58fd70610c7fe29d5890cdf161346f34cb9..5e2e22b66a63d1df420d4f39244abfccbe108900 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2616,11 +2616,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2618,11 +2618,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

patches/server/0010-Add-fakeplayer-support.patch

@@ -57,7 +57,7 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..8873e12cbd3d6f9071efedb35ea3c69c
          AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
          boolean flag1 = advancementprogress.isDone();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index af7acb628b84539b1ee5ef1934f75f091c4cd91e..0a59074eb9ca735d2919a825d27366316631db6b 100644
+index 961d25bbf868438bf5e5257bad745c8208a01171..ea0902fe8b3cabf4187da976d562527bfc498123 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -174,6 +174,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
@@ -68,7 +68,7 @@ index af7acb628b84539b1ee5ef1934f75f091c4cd91e..0a59074eb9ca735d2919a825d2736631
  // CraftBukkit end
  
  public class ServerPlayer extends Player {
-@@ -1163,6 +1164,13 @@ public class ServerPlayer extends Player {
+@@ -1182,6 +1183,13 @@ public class ServerPlayer extends Player {
                  this.lastSentHealth = -1.0F;
                  this.lastSentFood = -1;
  
@@ -143,7 +143,7 @@ index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..e2305caf0b3ce21810a31e05c943a6d8
  
                          if (itemstack.getItem() instanceof SwordItem) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d4ea7d19ae16a8ccafcfe5300bb380b28fd42b75..e97a8845c93c69e47dbab37d39945e150efe9066 100644
+index 9368ec01e498f913bc5b7b3e77fe87659090d9b5..622492be380cc20c586265998cd7d4e9fe818a46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -189,6 +189,8 @@ import org.bukkit.plugin.Plugin;

patches/server/0021-Multithreaded-Tracker.patch

@@ -31,10 +31,10 @@ index f597d65d56964297eeeed6c7e77703764178fee0..a584f2d0829db0bb220b2934ae2934da
      public ChunkHolder.FullChunkStatus status;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9e40e93e233d1f5865681f749cb19454b5f4b65e..9756f436877992bf56719d023a0ff9a6f41b7bc4 100644
+index a43902fbc160d39bcfd3937b251c9e827ec0214f..7179137194040ee29f05227aa67bd5f1ec5b4045 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1237,8 +1237,38 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1236,8 +1236,38 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
@@ -73,7 +73,7 @@ index 9e40e93e233d1f5865681f749cb19454b5f4b65e..9756f436877992bf56719d023a0ff9a6
          this.level.timings.tracker1.startTiming();
          try {
              for (TrackedEntity tracker : this.entityMap.values()) {
-@@ -1462,11 +1492,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1461,11 +1491,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public class TrackedEntity {
  
@@ -88,7 +88,7 @@ index 9e40e93e233d1f5865681f749cb19454b5f4b65e..9756f436877992bf56719d023a0ff9a6
  
          public TrackedEntity(Entity entity, int i, int j, boolean flag) {
              this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, j, flag, this::broadcast, this.seenBy); // CraftBukkit
-@@ -1478,7 +1508,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1477,7 +1507,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          // Paper start - use distance map to optimise tracker
          com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> lastTrackerCandidates;
  
@@ -97,7 +97,7 @@ index 9e40e93e233d1f5865681f749cb19454b5f4b65e..9756f436877992bf56719d023a0ff9a6
              com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> oldTrackerCandidates = this.lastTrackerCandidates;
              this.lastTrackerCandidates = newTrackerCandidates;
  
-@@ -1550,7 +1580,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1549,7 +1579,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
  
          public void removePlayer(ServerPlayer player) {
@@ -106,7 +106,7 @@ index 9e40e93e233d1f5865681f749cb19454b5f4b65e..9756f436877992bf56719d023a0ff9a6
              if (this.seenBy.remove(player.connection)) {
                  this.serverEntity.removePairing(player);
              }
-@@ -1558,7 +1588,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1557,7 +1587,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          }
  
          public void updatePlayer(ServerPlayer player) {

patches/server/0023-Optimize-entity-coordinate-key.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 99f56658c70f99592fb40c9df0ce3e47053d1bd5..e8782ae74df61be3046b702a2c39513c3c06c9d3 100644
+index 13082cd8de1a79a3b2fac6055bdaa163dbc7897b..cf70c8cb1ad5da3a8681760f69f4250c5627600d 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -208,7 +208,13 @@ public final class MCUtil {
@@ -25,10 +25,10 @@ index 99f56658c70f99592fb40c9df0ce3e47053d1bd5..e8782ae74df61be3046b702a2c39513c
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index efa899ed25ab0a09d9d6a6fc88c02f54bc3aef40..efbf618db7b8418c4e3f55b16c25e69a7dd5719a 100644
+index e0cc8171151f9db0d4b29980f097f81cacfe9718..a20930d2c09005a210e5242401cfb2e6c6082a01 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;

patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Move ThreadUnsafeRandom Initialization
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e310660e50867715dfcce041d7c8d4904a7dca12..2ff80dbb41324c5ea9dfa1f0b16983452d8778fa 100644
+index 5e2e22b66a63d1df420d4f39244abfccbe108900..449b3aaf00a13006e836e672b9c4d6d72b0274a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -792,7 +792,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -794,7 +794,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();

patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch

@@ -22,10 +22,10 @@ index 7d7501e85874e60263d5462dba02a4b3a79f68cb..86670ac9be2eca8b68fd0bc5caa3ad54
              boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2ff80dbb41324c5ea9dfa1f0b16983452d8778fa..114bc179c5ff436801c4f6bfeacf71c74d4d3f37 100644
+index 449b3aaf00a13006e836e672b9c4d6d72b0274a7..866ead7a0b53fe9bd1442c18f0050e60332d505d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -795,6 +795,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -797,6 +797,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); // Leaves - moved to super
      // Paper end
  
@@ -39,7 +39,7 @@ index 2ff80dbb41324c5ea9dfa1f0b16983452d8778fa..114bc179c5ff436801c4f6bfeacf71c7
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
-@@ -805,7 +812,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -807,7 +814,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.push("thunder");
          final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  
@@ -48,7 +48,7 @@ index 2ff80dbb41324c5ea9dfa1f0b16983452d8778fa..114bc179c5ff436801c4f6bfeacf71c7
              blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -829,7 +836,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -831,7 +838,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          gameprofilerfiller.popPush("iceandsnow");
@@ -58,7 +58,7 @@ index 2ff80dbb41324c5ea9dfa1f0b16983452d8778fa..114bc179c5ff436801c4f6bfeacf71c7
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 05499ae9fc331471db6e763a2adb46b5da8522d3..50de53684c27faa4bceeaf081b414c60b0ff8985 100644
+index 258d00692fa50e0932747a7a2f0ddae5ab659040..8ea31fbe83a9cfb3a54274896decb72207e14202 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity allocations
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index efbf618db7b8418c4e3f55b16c25e69a7dd5719a..c3e148375f5185cb82956b44406346daad24c28f 100644
+index a20930d2c09005a210e5242401cfb2e6c6082a01..2d8af400a75324b57bae87ceaee79e74da180cbd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -414,6 +414,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -413,6 +413,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end

patches/server/0036-Remove-lambda-from-ticking-guard.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove lambda from ticking guard
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 114bc179c5ff436801c4f6bfeacf71c74d4d3f37..7dac4b8c61db0bbce81a8fd85ed8779629517a9c 100644
+index 866ead7a0b53fe9bd1442c18f0050e60332d505d..7c17c83810d85ead2b9db7b0716ea447bba565bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -725,7 +725,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -727,7 +727,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              }
  
                              gameprofilerfiller.push("tick");

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams from getting nearby players
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c3e148375f5185cb82956b44406346daad24c28f..3d8a51337b87c246a32dde2e84a4d9e6f47cc7f5 100644
+index 2d8af400a75324b57bae87ceaee79e74da180cbd..5e85ecd3fc64f92e3ca65d127930ff195cd0949c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -490,25 +490,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -489,25 +489,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  

patches/server/0039-Remove-streams-and-iterators-from-range-check.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams and iterators from range check
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9756f436877992bf56719d023a0ff9a6f41b7bc4..bb39a68ba84c19530dd891c2035b9edaaf07d50b 100644
+index 7179137194040ee29f05227aa67bd5f1ec5b4045..39d0cc12f39c4ec77f32ee123e6b557948f0e303 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1620,19 +1620,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1619,19 +1619,45 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3d8a51337b87c246a32dde2e84a4d9e6f47cc7f5..8ec4e7f9ced0e0fdc0b1fadf1c2b72a26e1a1b84 100644
+index 5e85ecd3fc64f92e3ca65d127930ff195cd0949c..ed7b0a7465e06208b7a36d7381f8cfe9ec68d550 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4016,16 +4016,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4014,16 +4014,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index 3d8a51337b87c246a32dde2e84a4d9e6f47cc7f5..8ec4e7f9ced0e0fdc0b1fadf1c2b72a2
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4033,38 +4035,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4031,38 +4033,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();