Patches!!!

patches/server/Collision-optimisations.patch

@@ -2242,7 +2242,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  float f = this.getBlockSpeedFactor();
  
                  this.setDeltaMovement(this.getDeltaMovement().multiply((double) f, 1.0D, (double) f));
@@ -2290,7 +2290,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      if (this.remainingFireTicks <= 0) {
                          this.setRemainingFireTicks(-this.getFireImmuneTicks());
                      }
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      private Vec3 collide(Vec3 movement) {
@@ -2393,7 +2393,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List<VoxelShape> collisions) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              float f = this.dimensions.width * 0.8F;
              AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f);
  

patches/server/Detail-more-information-in-watchdog-dumps.patch

@@ -125,7 +125,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.onGround;
      }
  
@@ -168,7 +168,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  this.level().getProfiler().pop();
              }
          }
@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      private boolean isStateClimbable(BlockState state) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void setDeltaMovement(Vec3 velocity) {
@@ -192,7 +192,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void addDeltaMovement(Vec3 velocity) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
          // Paper end - fix MC-4
          if (this.position.x != x || this.position.y != y || this.position.z != z) {

patches/server/Distance-manager-tick-timings.patch

@@ -16,8 +16,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
 +    public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager
  
- 
      public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
+ 
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java

patches/server/Execute-chunk-tasks-mid-tick.patch

@@ -10,9 +10,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +0,0 @@ public final class MinecraftTimings {
+     public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
      public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
  
- 
 +    public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
 +
      private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
@@ -23,18 +23,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     private boolean pollTaskInternal() {
-         if (super.pollTask()) {
-+            this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
-             return true;
-         } else {
-             if (this.haveTime()) {
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         }
+         return flag;
      }
-     // Paper end
-+
+ 
 +    // Paper start - execute chunk tasks mid tick
 +    static final long CHUNK_TASK_QUEUE_BACKOFF_MIN_TIME = 25L * 1000L; // 25us
 +    static final long MAX_CHUNK_EXEC_TIME = 1000L; // 1us
@@ -104,27 +95,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +    // Paper end - execute chunk tasks mid tick
- }
++
+     private boolean pollTaskInternal() {
+         if (super.pollTask()) {
++            this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
+             return true;
+         } else {
+             if (this.tickRateManager.isSprinting() || this.haveTime()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource {
-             // Paper end
-             Iterator iterator1 = list.iterator();
+                 boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
+                 Iterator iterator1 = list.iterator();
  
-+            int chunksTicked = 0; // Paper
-             while (iterator1.hasNext()) {
-                 ServerChunkCache.ChunkAndHolder chunkproviderserver_a = (ServerChunkCache.ChunkAndHolder) iterator1.next();
-                 LevelChunk chunk1 = chunkproviderserver_a.chunk;
++                int chunksTicked = 0; // Paper
+                 while (iterator1.hasNext()) {
+                     ServerChunkCache.ChunkAndHolder chunkproviderserver_a = (ServerChunkCache.ChunkAndHolder) iterator1.next();
+                     LevelChunk chunk1 = chunkproviderserver_a.chunk;
 @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource {
- 
-                     if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) {
-                         this.level.tickChunk(chunk1, k);
-+                        if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper
+                         if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) {
+                             this.level.timings.doTickTiles.startTiming(); // Spigot
+                             this.level.tickChunk(chunk1, l);
++                            if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper
+                             this.level.timings.doTickTiles.stopTiming(); // Spigot
+                         }
                      }
-                 }
-             }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -159,7 +156,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // Spigot end
-             } else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) {
+             } else if (flag && this.shouldTickBlocksAt(tickingblockentity.getPos())) {
                  tickingblockentity.tick();
 +                // Paper start - execute chunk tasks during tick
 +                if ((this.tileTickPosition & 7) == 0) {

patches/server/Fix-Spigot-growth-modifiers.patch

@@ -17,12 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 @@ -0,0 +0,0 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl
- 
-     @Override
-     protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
--        return super.getGrowIntoState(state, random).setValue(BERRIES, Boolean.valueOf(random.nextFloat() < 0.11F));
-+        // Paper start
-+        return this.getGrowIntoState(state, random, null);
+         return to.setValue(BERRIES, from.getValue(BERRIES));
      }
  
 +    @Override
@@ -33,8 +28,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      @Override
-     public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {
-         return new ItemStack(Items.GLOW_BERRIES);
+     protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
+-        return super.getGrowIntoState(state, random).setValue(BERRIES, Boolean.valueOf(random.nextFloat() < 0.11F));
++        // Paper start
++        return this.getGrowIntoState(state, random, null);
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java

patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch

@@ -13,7 +13,7 @@ diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -0,0 +0,0 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -0,0 +0,0 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
          return this.source.getBukkitSender(this);
      }
      // CraftBukkit end
@@ -123,7 +123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java
 @@ -0,0 +0,0 @@ public class EntitySelectorOptions {
      public static final DynamicCommandExceptionType ERROR_ENTITY_TYPE_INVALID = new DynamicCommandExceptionType((entity) -> {
-         return Component.translatable("argument.entity.options.type.invalid", entity);
+         return Component.translatableEscape("argument.entity.options.type.invalid", entity);
      });
 +    // Paper start
 +    public static final DynamicCommandExceptionType ERROR_ENTITY_TAG_INVALID = new DynamicCommandExceptionType((object) -> {

patches/server/Fix-tripwire-state-inconsistency.patch

@@ -33,10 +33,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          int j = 0;
 @@ -0,0 +0,0 @@ public class TripWireBlock extends Block {
  
-                     if (iblockdata1.is((Block) this.hook)) {
+                     if (iblockdata1.is(this.hook)) {
                          if (iblockdata1.getValue(TripWireHookBlock.FACING) == enumdirection.getOpposite()) {
--                            this.hook.calculateState(world, blockposition1, iblockdata1, false, true, k, state);
-+                            this.hook.calculateState(world, blockposition1, iblockdata1, false, true, k, state, beingRemoved); // Paper - fix state inconsistency
+-                            TripWireHookBlock.calculateState(world, blockposition1, iblockdata1, false, true, k, state);
++                            TripWireHookBlock.calculateState(world, blockposition1, iblockdata1, false, true, k, state, beingRemoved); // Paper - fix state inconsistency
                          }
                      } else if (iblockdata1.is((Block) this)) {
                          ++k;
@@ -45,23 +45,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -0,0 +0,0 @@ public class TripWireHookBlock extends Block {
+         TripWireHookBlock.calculateState(world, pos, state, false, false, -1, (BlockState) null);
      }
  
-     public void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1) {
+-    public static void calculateState(Level world, BlockPos pos, BlockState state, boolean flag, boolean flag1, int i, @Nullable BlockState iblockdata1) {
++    public static void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1) {
 +        // Paper start - fix tripwire inconsistency
-+        this.calculateState(world, pos, state, beingRemoved, flag1, i, iblockdata1, false);
++        calculateState(world, pos, state, beingRemoved, flag1, i, iblockdata1, false);
 +    }
 +
-+    public void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1, boolean tripWireBeingRemoved) {
++    public static void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1, boolean tripWireBeingRemoved) {
 +        // Paper end
-         Direction enumdirection = (Direction) state.getValue(TripWireHookBlock.FACING);
-         boolean flag2 = (Boolean) state.getValue(TripWireHookBlock.ATTACHED);
-         boolean flag3 = (Boolean) state.getValue(TripWireHookBlock.POWERED);
-@@ -0,0 +0,0 @@ public class TripWireHookBlock extends Block {
-                 boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
+         Optional<Direction> optional = state.getOptionalValue(TripWireHookBlock.FACING);
  
-                 flag5 |= flag6 && flag7;
-+                if (k != i || !tripWireBeingRemoved || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed
-                 aiblockdata[k] = iblockdata2;
-                 if (k == i) {
-                     world.scheduleTick(pos, (Block) this, 10);
+         if (optional.isPresent()) {
+@@ -0,0 +0,0 @@ public class TripWireHookBlock extends Block {
+                     boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
+ 
+                     flag5 |= flag6 && flag7;
++                    if (k != i || !tripWireBeingRemoved || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed
+                     aiblockdata[k] = iblockdata2;
+                     if (k == i) {
+                         world.scheduleTick(pos, block, 10);

patches/server/Fix-upstreams-block-state-factories.patch

@@ -291,6 +291,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        register(Material.SUSPICIOUS_SAND, CraftSuspiciousSand.class, CraftSuspiciousSand::new, BrushableBlockEntity::new);
 -        register(Material.SUSPICIOUS_GRAVEL, CraftBrushableBlock.class, CraftBrushableBlock::new, BrushableBlockEntity::new);
 -        register(Material.TRAPPED_CHEST, CraftChest.class, CraftChest::new, TrappedChestBlockEntity::new);
+-        register(Material.CRAFTER, CraftCrafter.class, CraftCrafter::new, CrafterBlockEntity::new);
+-        register(Material.TRIAL_SPAWNER, CraftTrialSpawner.class, CraftTrialSpawner::new, TrialSpawnerBlockEntity::new);
 +        // Paper start - simplify
 +        register(BlockEntityType.SIGN, CraftSign.class, CraftSign::new);
 +        register(BlockEntityType.HANGING_SIGN, CraftHangingSign.class, CraftHangingSign::new);
@@ -333,6 +335,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        register(BlockEntityType.STRUCTURE_BLOCK, CraftStructureBlock.class, CraftStructureBlock::new);
 +        register(BlockEntityType.BRUSHABLE_BLOCK, CraftBrushableBlock.class, CraftBrushableBlock::new); // note: spigot still uses CraftSuspiciousSand impl for that block type
 +        register(BlockEntityType.TRAPPED_CHEST, CraftChest.class, CraftChest::new);
++        register(BlockEntityType.CRAFTER, CraftCrafter.class, CraftCrafter::new);
++        register(BlockEntityType.TRIAL_SPAWNER, CraftTrialSpawner.class, CraftTrialSpawner::new);
 +        // Paper end
      }
  

patches/server/Forward-CraftEntity-in-teleport-command.patch

@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void restoreFrom(Entity original) {
@@ -22,10 +22,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                     if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
-                         ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+                         }
                      }
+                     // CraftBukkit end
 -                    // CraftBukkit start - Forward the CraftEntity to the new entity
 -                    this.getBukkitEntity().setHandle(entity);
 -                    entity.bukkitEntity = this.getBukkitEntity();

patches/server/Improve-scoreboard-entries.patch

@@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java
 @@ -0,0 +0,0 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective
-         return new CraftScore(this, entry);
+         return new CraftScore(this, CraftScoreboard.getScoreHolder(entry));
      }
  
 +    // Paper start
@@ -28,9 +28,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -0,0 +0,0 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
-     public Scoreboard getHandle() {
-         return this.board;
+         this.board.setDisplayObjective(CraftScoreboardTranslations.fromBukkitSlot(slot), null);
      }
+ 
 +    // Paper start
 +    @Override
 +    public ImmutableSet<Score> getScoresFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException {
@@ -50,7 +50,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return this.getEntryTeam(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName());
 +    }
 +    // Paper end
- }
++
+     // CraftBukkit method
+     public Scoreboard getHandle() {
+         return this.board;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java

patches/server/Optimise-random-block-ticking.patch

@@ -120,14 +120,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!this.paperConfig().environment.disableIceAndSnow) { // Paper
          for (int l = 0; l < randomTickSpeed; ++l) {
              if (this.random.nextInt(48) == 0) {
--                this.tickIceAndSnow(flag, this.getBlockRandomPos(j, 0, k, 15));
+-                this.tickPrecipitation(this.getBlockRandomPos(j, 0, k, 15));
++                // Paper start
 +                this.getRandomBlockPosition(j, 0, k, 15, blockposition);
-+                this.tickIceAndSnow(flag, blockposition, chunk);
++                this.tickPrecipitation(blockposition, chunk);
++                // Paper end
              }
          }
          } // Paper
- 
-+        // Paper start - optimise random block ticking
+@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("tickBlocks");
          timings.chunkTicksBlocks.startTiming(); // Paper
          if (randomTickSpeed > 0) {
@@ -149,6 +150,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        if (iblockdata.isRandomlyTicking()) {
 -                            iblockdata.randomTick(this, blockposition1, this.random);
 -                        }
++            // Paper start - optimize random block ticking
 +            LevelChunkSection[] sections = chunk.getSections();
 +            final int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
 +            for (int sectionIndex = 0; sectionIndex < sections.length; sectionIndex++) {
@@ -179,9 +181,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        gameprofilerfiller.pop();
 -                    }
 +                    iblockdata.randomTick(this, blockposition2, this.randomTickRandom);
-+                    // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
-+                    // TODO CHECK ON UPDATE (ping the Canadian)
                  }
++                // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
++                // TODO CHECK ON UPDATE (ping the Canadian)
              }
          }
 +        // Paper end - optimise random block ticking
@@ -190,14 +192,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          gameprofilerfiller.pop();
      }
  
--    private void tickIceAndSnow(boolean raining, BlockPos pos) {
+     @VisibleForTesting
+-    public void tickPrecipitation(BlockPos pos) {
 -        BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
 -        BlockPos blockposition2 = blockposition1.below();
-+    private void tickIceAndSnow(boolean raining, BlockPos.MutableBlockPos blockposition1, final LevelChunk chunk) { // Paper - optimise chunk ticking
++    public void tickPrecipitation(BlockPos.MutableBlockPos blockposition1, final LevelChunk chunk) { // Paper - optimise chunk ticking
 +        // Paper start - optimise chunk ticking
 +        int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition1.getX() & 15, blockposition1.getZ() & 15) + 1;
 +        int downY = normalY - 1;
 +        blockposition1.setY(normalY);
++        // Paper end - optimise chunk ticking
          Biome biomebase = (Biome) this.getBiome(blockposition1).value();
  
 -        if (biomebase.shouldFreeze(this, blockposition2)) {
@@ -206,9 +210,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (biomebase.shouldFreeze(this, blockposition1)) {
 +            org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
          }
-+        // Paper end - optimise chunk ticking
  
-         if (raining) {
+         if (this.isRaining()) {
              int i = this.getGameRules().getInt(GameRules.RULE_SNOW_ACCUMULATION_HEIGHT);
  
 +            blockposition1.setY(normalY); // Paper - optimise chunk ticking

patches/server/Time-scoreboard-search.patch

@@ -15,7 +15,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
      public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
 +    public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
-+
  
      private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
  
@@ -26,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public final class CraftScoreboardManager implements ScoreboardManager {
  
      // CraftBukkit method
-     public void getScoreboardScores(ObjectiveCriteria criteria, String name, Consumer<Score> consumer) {
+     public void forAllObjectives(ObjectiveCriteria criteria, ScoreHolder holder, Consumer<ScoreAccess> consumer) {
 +        // Paper start - add timings for scoreboard search
 +        // plugins leaking scoreboards will make this very expensive, let server owners debug it easily
 +        co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.startTimingIfSync();
@@ -34,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end - add timings for scoreboard search
          for (CraftScoreboard scoreboard : this.scoreboards) {
              Scoreboard board = scoreboard.board;
-             board.forAllObjectives(criteria, name, (score) -> consumer.accept(score));
+             board.forAllObjectives(criteria, holder, (score) -> consumer.accept(score));
          }
 +        } finally { // Paper start - add timings for scoreboard search
 +            co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.stopTimingIfSync();

patches/server/Update-head-rotation-in-missing-places.patch

@@ -11,7 +11,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();

patches/server/don-t-attempt-to-teleport-dead-entities.patch

@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle