Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f4741f2 Expose particle status client option (#11573)
PaperMC/Paper@7e789e8 Prevent duplicate/superfluous BlockPhysicsEvent (#11609)
PaperMC/Paper@afb5b13 Replace SimpleRandom with (Simple)ThreadUnsafeRandom
PaperMC/Paper@d38624b Do not call modifyEntityTrackingRange on own range

gradle.properties

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.3-R0.1-SNAPSHOT
 mcVersion=1.21.3
 
-paperRef=5f0932b6c8ac9a3c900075fc40f77b506c63ed82
+paperRef=d38624bdd8757f167552a278e6a355289aec7c48
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false

patches/server/0005-Client-Visibility-Settings.patch

@@ -649,7 +649,7 @@ index 1a37654aff9a9c86c9f7af10a1cf721371f0c5ec..82644b34a77dc5e5af38260b7b07b3ec
      public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) {
          this.sectionPos = sectionPos;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 28a7bcb1199f33e15945dbb5fc8ff796f38bc495..f8a9ef307dbe7fd70577b3ef4fa2e4fc99fb1fb1 100644
+index 08ff63ee9241102d211d9db6a32586167491cf58..02009fe5365022bd365a572c5a4f000c374db23e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1889,6 +1889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -661,7 +661,7 @@ index 28a7bcb1199f33e15945dbb5fc8ff796f38bc495..f8a9ef307dbe7fd70577b3ef4fa2e4fc
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5b3a886c624b36557cbfaccdc3fb05a46a4ba36a..b05ecbfd33c9924ae0d3afcfc3756a356a63efe5 100644
+index e6af9b8793812e2007971c9040fb54b6af068081..16fde1dbf3932fbbd1806a343f6a8cc7313db403 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -179,6 +179,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -734,7 +734,7 @@ index 5b3a886c624b36557cbfaccdc3fb05a46a4ba36a..b05ecbfd33c9924ae0d3afcfc3756a35
                  // CraftBukkit start - respect vanish API
                  if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2a622f2d796ecb42598d230319804d06f0a30808..7a64aaeecafe067e832a82a77113495164467599 100644
+index 1cce0f401f456370be2edb3a1184c9cc383b2053..fcf9b28cf5eabd4d94f5f3dd42b8367c1765df41 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -594,6 +594,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -780,7 +780,7 @@ index 2a622f2d796ecb42598d230319804d06f0a30808..7a64aaeecafe067e832a82a771134951
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2e8ecf3bbb9f9ceba6f896738fa1ab8e2bd0fed6..d4dd9c45bc9603ceccc8ebb0eef47c50b48dcf98 100644
+index 5a8f396d47577f087abb415c972fd4f51e50faba..ac8308be5b200237aa61a21404e558f245356546 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -359,6 +359,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -857,10 +857,10 @@ index b5d5dbc50a7b8c40739a15f164ffd08fdc534f9c..5cfcc7a1e9461fd7dfd6d7100bdc9789
                          if (this.player.containerMenu != oldContainer) {
                              return;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ed5b00620527c1776722d25b1b45f1544802a341..4896f3334546b55385e93262dc1a16ef8bda7c45 100644
+index a15546e433ebba6c0de01bdaaef201a3d99a87b5..2aaf7ce81bff0c03da2211f145489d304ac669d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -612,6 +612,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -568,6 +568,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
      // Paper end - optimise entity tracker
@@ -896,10 +896,10 @@ index de87483600e55d88176fe25db621bbd3e464729f..5bd189fad703ac99d57258fa448dbcc1
  
      public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d0010dfd22463986bf3be9b3ee015ce92735753e..1e3bd95d75210926c2739514eecbda7a21550ba4 100644
+index 7aa3ba20f63be469ec82637e79f864262e41f3c6..329e1e93df4f369031d045129b1eb4020b0cc579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2392,6 +2392,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2394,6 +2394,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
          }
@@ -913,7 +913,7 @@ index d0010dfd22463986bf3be9b3ee015ce92735753e..1e3bd95d75210926c2739514eecbda7a
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
-@@ -2421,6 +2428,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2423,6 +2430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          paper.putLong("LastLogin", handle.loginTime);
          paper.putLong("LastSeen", System.currentTimeMillis());
          // Paper end
@@ -925,7 +925,7 @@ index d0010dfd22463986bf3be9b3ee015ce92735753e..1e3bd95d75210926c2739514eecbda7a
      }
  
      @Override
-@@ -3095,6 +3107,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3097,6 +3109,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  

patches/server/0007-Load-Chunks-on-Movement.patch

@@ -51,10 +51,10 @@ index e701f57ac8b0efdf739389f9be7a255220bb3e21..35a437f3acfd2659341abd8ab6a3b21c
      public static <T> TicketType<T> create(String name, Comparator<T> argumentComparator) {
          return new TicketType<>(name, argumentComparator, 0L);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4896f3334546b55385e93262dc1a16ef8bda7c45..d16ed3ea0ae380ddccb28a99062c7cccf84c4877 100644
+index 2aaf7ce81bff0c03da2211f145489d304ac669d2..43f9ab0a18e1cb1998b737a948867b91962a805f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -616,6 +616,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -572,6 +572,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public boolean isPrimedTNT;
      public boolean isFallingBlock;
      // Sakura end - visibility api and command
@@ -75,7 +75,7 @@ index 4896f3334546b55385e93262dc1a16ef8bda7c45..d16ed3ea0ae380ddccb28a99062c7ccc
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -1600,7 +1614,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1556,7 +1570,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
          ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder(
              this.level, (Entity)(Object)this, initialCollisionBox, potentialCollisionsVoxel, potentialCollisionsBB,
@@ -84,7 +84,7 @@ index 4896f3334546b55385e93262dc1a16ef8bda7c45..d16ed3ea0ae380ddccb28a99062c7ccc
          );
          potentialCollisionsBB.addAll(entityAABBs);
          final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
-@@ -5243,12 +5257,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5199,12 +5213,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
      @Override
      public boolean shouldBeSaved() {

patches/server/0010-Slice-Packet-obfuscation-and-reduction.patch

@@ -185,10 +185,10 @@ index 90eb4927fa51ce3df86aa7b6c71f49150a03e337..a960c7ac83cb32b2eb1f292fd9a561ba
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d16ed3ea0ae380ddccb28a99062c7cccf84c4877..124916e1ee9d32a530cbce90ed22fc1383cf49d1 100644
+index 43f9ab0a18e1cb1998b737a948867b91962a805f..42e72e0406c3e429fc7a6d15cbfa0217e309db5f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3717,7 +3717,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3673,7 +3673,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }

patches/server/0015-Store-Entity-Data-State.patch

@@ -52,10 +52,10 @@ index 0000000000000000000000000000000000000000..aeb5f128b369753cb20b7310fa382ddf
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 124916e1ee9d32a530cbce90ed22fc1383cf49d1..df2deeeaf473f84268288be5eb60a9a7068a8d46 100644
+index 42e72e0406c3e429fc7a6d15cbfa0217e309db5f..b460ce03626f8995e029ad7dbd932cc2c8f0bf20 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -630,6 +630,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -586,6 +586,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return flags;
      }
      // Sakura end - load chunks on movement
@@ -82,7 +82,7 @@ index 124916e1ee9d32a530cbce90ed22fc1383cf49d1..df2deeeaf473f84268288be5eb60a9a7
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 932e64a75d6a2d0e6c82fd8917d3faa054c2512f..49b01f78529f067eee65b14e7906b9f1de768f06 100644
+index 10107e6c4b448ce76650eb334bba740d11fd5874..b40db35a8162efcaa1fa88aa760a4d6f59ec1718 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1499,6 +1499,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0016-Merge-Cannon-Entities.patch

@@ -408,7 +408,7 @@ index 0000000000000000000000000000000000000000..fc68bccf135bdcc7b3db7976e452ccae
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index decea6322f5ea42ff476fbd00d11f0f7230eb711..70d2ca47db058ff02e0d779dd38fbae74cf6c24e 100644
+index 2501054d84ecff8835a1b89b0d04ba6e934c12ed..70529b088f6d0056abc6d04fc6609647b4525021 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1903,6 +1903,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -420,7 +420,7 @@ index decea6322f5ea42ff476fbd00d11f0f7230eb711..70d2ca47db058ff02e0d779dd38fbae7
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 28064b97b01cb1509232658f13a5f03f7b9a7443..c7ea2da01935b6f13025ea81c4abacc5466da1bb 100644
+index 8aa894cb85b08d41eb84d6c013f21585065226e7..d1268f21dc87b7d8755ff2cf95a09a780e466576 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -806,6 +806,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -448,10 +448,10 @@ index 28064b97b01cb1509232658f13a5f03f7b9a7443..c7ea2da01935b6f13025ea81c4abacc5
                              this.guardEntityTick(this::tickNonPassenger, entity);
                              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index df2deeeaf473f84268288be5eb60a9a7068a8d46..21670e77ccaa442b289fa7bb5911716e24afcd4d 100644
+index b460ce03626f8995e029ad7dbd932cc2c8f0bf20..e7f59ead5223858e20722e52b8e31961fe29dccf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -649,6 +649,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -605,6 +605,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return to.entityState() != null && to.entityState().comparePositionAndMotion(this);
      }
      // Sakura end - store entity data/state
@@ -475,7 +475,7 @@ index df2deeeaf473f84268288be5eb60a9a7068a8d46..21670e77ccaa442b289fa7bb5911716e
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -5247,6 +5264,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5203,6 +5220,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (this.removalReason != Entity.RemovalReason.UNLOADED_TO_CHUNK) { this.getPassengers().forEach(Entity::stopRiding); } // Paper - rewrite chunk system
          this.levelCallback.onRemove(entity_removalreason);
          this.onRemoval(entity_removalreason);
@@ -688,7 +688,7 @@ index 25a25b5c6497c9823a41e6bd8fd22f0841377c62..6b739e820af6333c1ff3a4b87154d4c0
          if (nbt.contains("explosion_power", 99)) {
              this.explosionPower = Mth.clamp(nbt.getFloat("explosion_power"), 0.0F, 128.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 49b01f78529f067eee65b14e7906b9f1de768f06..41a6c621dc26fe4bcb254d0465588c9227832758 100644
+index b40db35a8162efcaa1fa88aa760a4d6f59ec1718..d73073ae752d9983785b9402088ae6cf7188a8bf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -841,6 +841,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0020-Optimise-cannon-entity-movement.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise cannon entity movement
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 21670e77ccaa442b289fa7bb5911716e24afcd4d..e963e972ae1006f977a68c69b7529c1da2f7bdf5 100644
+index e7f59ead5223858e20722e52b8e31961fe29dccf..12ab6b6ff6444da963f3e1160bf779f7fdb72c48 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1258,6 +1258,75 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1214,6 +1214,75 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.moveStartZ;
      }
      // Paper end - detailed watchdog information
@@ -84,7 +84,7 @@ index 21670e77ccaa442b289fa7bb5911716e24afcd4d..e963e972ae1006f977a68c69b7529c1d
  
      public void move(MoverType type, Vec3 movement) {
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
-@@ -1619,6 +1688,107 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1575,6 +1644,107 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return offsetFactor;
      }
  

patches/server/0021-Entity-pushed-by-fluid-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Entity pushed by fluid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e963e972ae1006f977a68c69b7529c1da2f7bdf5..fd8c05a58473633a2debea52f610912d314f7eb2 100644
+index 12ab6b6ff6444da963f3e1160bf779f7fdb72c48..cc31ee0d9ab13fd08dc33b6757173682883a2ac5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -666,6 +666,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -622,6 +622,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
      // Sakura end - merge cannon entities
@@ -16,7 +16,7 @@ index e963e972ae1006f977a68c69b7529c1da2f7bdf5..fd8c05a58473633a2debea52f610912d
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -4490,7 +4491,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4446,7 +4447,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean isPushedByFluid() {

patches/server/0024-Optimise-TNT-fluid-state.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise TNT fluid state
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fd8c05a58473633a2debea52f610912d314f7eb2..babe513754ab4e211b9741ba94bc45670120c83e 100644
+index cc31ee0d9ab13fd08dc33b6757173682883a2ac5..687eb620c0ee3fc19472f830b6296862a7dcf01c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2277,7 +2277,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2233,7 +2233,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.isInWater() || flag;
      }
  

patches/server/0037-Configure-cannon-physics-by-version.patch

@@ -106,10 +106,10 @@ index ebe5f0c8c2f09920b5f5ef734e63f5e7cd8bd3a1..320cdb1f4e655a2d093890e88476df90
      protected int getExplosionCount() {
          if (this.cause.getMergeEntityData().getMergeLevel() == MergeLevel.NONE) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b37500319c4a 100644
+index 687eb620c0ee3fc19472f830b6296862a7dcf01c..dd93bff521e8bfc72416cebed20cb3a5bce094b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -385,7 +385,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -341,7 +341,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private final double[] pistonDeltas;
      private long pistonDeltasGameTime;
      private EntityDimensions dimensions;
@@ -118,7 +118,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
      public Optional<BlockPos> mainSupportingBlockPos;
-@@ -667,6 +667,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -623,6 +623,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
      // Sakura end - merge cannon entities
      public boolean pushedByFluid = true; // Sakura - entity pushed by fluid api
@@ -132,7 +132,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -1205,7 +1212,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1161,7 +1168,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      protected void checkSupportingBlock(boolean onGround, @Nullable Vec3 movement) {
@@ -141,7 +141,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
              AABB axisalignedbb = this.getBoundingBox();
              AABB axisalignedbb1 = new AABB(axisalignedbb.minX, axisalignedbb.minY - 1.0E-6D, axisalignedbb.minZ, axisalignedbb.maxX, axisalignedbb.minY, axisalignedbb.maxZ);
              Optional<BlockPos> optional = this.level.findSupportingBlock(this, axisalignedbb1);
-@@ -1265,7 +1272,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1221,7 +1228,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
@@ -150,7 +150,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -1283,8 +1290,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1239,8 +1246,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              Vec3 vec3d1 = this.sakura_collide(movement);
              double d0 = vec3d1.lengthSqr();
  
@@ -161,7 +161,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
                      BlockHitResult clipResult = this.level().clip(new ClipContext(this.position(), this.position().add(vec3d1), ClipContext.Block.FALLDAMAGE_RESETTING, ClipContext.Fluid.WATER, this));
                      if (clipResult.getType() != HitResult.Type.MISS) {
                          this.resetFallDistance();
-@@ -1313,6 +1320,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1269,6 +1276,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              } else {
                  if (this.horizontalCollision) {
                      Vec3 vec3d2 = this.getDeltaMovement();
@@ -173,7 +173,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
                      this.setDeltaMovement(movedX ? 0.0D : vec3d2.x, vec3d2.y, movedZ ? 0.0D : vec3d2.z);
                  }
  
-@@ -1718,7 +1730,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1674,7 +1686,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              bb = currBoundingBox.expandTowards(movement.x, movement.y, movement.z);
          }
          this.collectCollisions(bb, voxelList, bbList);
@@ -182,7 +182,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
      }
  
      private Vec3 collideAxisScan(Vec3 movement, AABB currBoundingBox, List<VoxelShape> voxelList, List<AABB> bbList) {
-@@ -1726,7 +1738,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1682,7 +1694,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          double y = movement.y;
          double z = movement.z;
  
@@ -194,7 +194,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
  
          if (y != 0.0) {
              y = this.scanY(currBoundingBox, y, voxelList, bbList);
-@@ -1824,7 +1839,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1780,7 +1795,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_CHECK_BORDER  | this.getExtraCollisionFlags(), null // Sakura - load chunks on movement
          );
          potentialCollisionsBB.addAll(entityAABBs);
@@ -203,7 +203,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
  
          final boolean collidedX = collided.x != movement.x;
          final boolean collidedY = collided.y != movement.y;
-@@ -1991,7 +2006,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1947,7 +1962,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
      private void checkInsideBlocks(List<Entity.Movement> queuedCollisionChecks, Set<BlockState> collidedBlocks) {
          if (this.isAffectedByBlocks()) {
@@ -215,7 +215,7 @@ index babe513754ab4e211b9741ba94bc45670120c83e..0e479e1960b3f054bf8991f5d429b375
              LongSet longset = this.visitedBlocks;
              Iterator iterator = queuedCollisionChecks.iterator();
  
-@@ -1999,7 +2017,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1955,7 +1973,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  Entity.Movement entity_b = (Entity.Movement) iterator.next();
                  Vec3 vec3d = entity_b.from();
                  Vec3 vec3d1 = entity_b.to();
@@ -456,7 +456,7 @@ index 3e4935f4a07fa14152d1f55f069c49fdd2f3bc02..1231d99374ffa5d988e5b240be2da95f
      // Paper end - Option to prevent TNT from moving in water
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a1396dc2f85f9ab547dd12445090037fc5462b96..b8d59ca87e908ce2bdd978007e3a97e297a10278 100644
+index 452a9fef94d093b637245c82d36dacbb1e1d86c5..b67c4bcc7afb074134344b5f239370290416934e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -841,6 +841,170 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch

@@ -46,10 +46,10 @@ index 27b7be52f7617a6ecd1ff7e967604424f40027bc..417b18e1179f962e218f63679785e487
                                          mutablePos.set(blockX, blockY, blockZ);
                                          blockCollision = blockData.getCollisionShape(world, mutablePos, collisionShape);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0e479e1960b3f054bf8991f5d429b37500319c4a..7a07be8dfabde5ab99c354bc7aef29fcf551c9e1 100644
+index dd93bff521e8bfc72416cebed20cb3a5bce094b8..247759b7e225bbd14951e7876d1fff6ded62cef0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -627,6 +627,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -583,6 +583,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              flags |= ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_FLAG_ADD_TICKET;
          }
  

patches/server/0057-Add-entity-travel-distance-limits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity travel distance limits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e39f4e4716b8794e506d3ffcbc35ae88d0fbc23a..a3c8ed82e46056be1a3ca002664e6fe6fa46bc2e 100644
+index 423d26d6b833e9aa39a84333b9627ad709711378..2ed9565e44435239d8a375ca9dc94e839b2e757f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1328,6 +1328,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -21,10 +21,10 @@ index e39f4e4716b8794e506d3ffcbc35ae88d0fbc23a..a3c8ed82e46056be1a3ca002664e6fe6
          } else { entity.inactiveTick(); } // Paper - EAR 2
          gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7a07be8dfabde5ab99c354bc7aef29fcf551c9e1..344c2bac7fc694e84532cd384be32e7d259e8130 100644
+index 247759b7e225bbd14951e7876d1fff6ded62cef0..a48d871f851c9cafdb05fef3e33ec1de81b7d0bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -682,6 +682,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -638,6 +638,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.physics;
      }
      // Sakura end - physics version api
@@ -44,7 +44,7 @@ index 7a07be8dfabde5ab99c354bc7aef29fcf551c9e1..344c2bac7fc694e84532cd384be32e7d
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -735,6 +748,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -691,6 +704,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.entityData = datawatcher_a.build();
          this.setPos(0.0D, 0.0D, 0.0D);
          this.eyeHeight = this.dimensions.eyeHeight();

patches/server/0072-Entity-tracking-range-modifier.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity tracking range modifier
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fa77e44a33dd2da678f8ad711f26ce60d3d7d7aa..ccb8684e3f3e70a9ccb1033acd5938a96b415705 100644
+index 606a2626fe0b693049c69924e479a6d875f22480..b2aca1d458d2ea40952b047f991e356aa35b02fb 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1332,7 +1332,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -21,7 +21,7 @@ index fa77e44a33dd2da678f8ad711f26ce60d3d7d7aa..ccb8684e3f3e70a9ccb1033acd5938a9
                  double d2 = d0 * d0;
                  // Paper start - Configurable entity tracking range by Y
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d4dd9c45bc9603ceccc8ebb0eef47c50b48dcf98..90399fdc414929b33de29286f8a27097830c5d4c 100644
+index ac8308be5b200237aa61a21404e558f245356546..c9c39cbdf7e0ff715630fc98712db0f202362eb5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -360,6 +360,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -33,10 +33,10 @@ index d4dd9c45bc9603ceccc8ebb0eef47c50b48dcf98..90399fdc414929b33de29286f8a27097
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e3bd95d75210926c2739514eecbda7a21550ba4..00745aaf57ca588fde4b9e88608955f7e86a992d 100644
+index 329e1e93df4f369031d045129b1eb4020b0cc579..b391b5384a455b44f2c857d11fadb9197ab31dc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3037,6 +3037,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3039,6 +3039,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance();
      }
  

patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable left shooting and adjusting limits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 344c2bac7fc694e84532cd384be32e7d259e8130..5067db32a3e024a27c1da8f76a0abade6f20096d 100644
+index a48d871f851c9cafdb05fef3e33ec1de81b7d0bd..dcf2c3f9236a96618608887b269164b23127d6ff 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -695,6 +695,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -651,6 +651,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Math.max(x, z) >= this.travelDistanceLimit;
      }
      // Sakura end - entity travel distance limits
@@ -55,7 +55,7 @@ index 344c2bac7fc694e84532cd384be32e7d259e8130..5067db32a3e024a27c1da8f76a0abade
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -1773,6 +1813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1729,6 +1769,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
  
          if (xSmaller && z != 0.0) {
@@ -63,7 +63,7 @@ index 344c2bac7fc694e84532cd384be32e7d259e8130..5067db32a3e024a27c1da8f76a0abade
              z = this.scanZ(currBoundingBox, z, voxelList, bbList);
              if (z != 0.0) {
                  currBoundingBox = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.offsetZ(currBoundingBox, z);
-@@ -1780,6 +1821,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1736,6 +1777,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
  
          if (x != 0.0) {

patches/server/0079-Optimise-check-inside-blocks-and-traverse-blocks.patch

@@ -71,10 +71,10 @@ index 0000000000000000000000000000000000000000..e00c07c614e007c007076e3dbe8bd8cc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5067db32a3e024a27c1da8f76a0abade6f20096d..3e6733b3195019f0090ae67136bbcf8467b8333a 100644
+index dcf2c3f9236a96618608887b269164b23127d6ff..2c31c508409780334cd925368a1623192f8428a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2094,6 +2094,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2050,6 +2050,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
                  final Iterator iterator1 = positions.iterator();
                  // Sakura end - physics version api
@@ -86,7 +86,7 @@ index 5067db32a3e024a27c1da8f76a0abade6f20096d..3e6733b3195019f0090ae67136bbcf84
  
                  while (iterator1.hasNext()) {
                      BlockPos blockposition = (BlockPos) iterator1.next();
-@@ -2102,7 +2107,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2058,7 +2063,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          return;
                      }