(Almost) all patches applied

patches/server/Actually-optimise-explosions.patch

@@ -463,8 +463,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              // CraftBukkit end
                          }
  
--                        double d12 = (1.0D - d7) * this.getBlockDensity(vec3d, entity); // Paper - Optimize explosions
+-                        double d12 = (1.0D - d7) * this.getBlockDensity(vec3d, entity) * (double) this.damageCalculator.getKnockbackMultiplier(entity); // Paper - Optimize explosions
-+                        double d12 = (1.0D - d7) * this.getBlockDensity(vec3d, entity, blockCache, blockPos); // Paper - Optimize explosions
++                        double d12 = (1.0D - d7) * this.getBlockDensity(vec3d, entity, blockCache, blockPos) * (double) this.damageCalculator.getKnockbackMultiplier(entity); // Paper - Optimize explosions
                          double d13;
  
                          if (entity instanceof LivingEntity) {
@@ -501,7 +501,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java
 +++ b/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java
 @@ -0,0 +0,0 @@ public class ExplosionDamageCalculator {
-         return true;
+         return 1.0F;
      }
  
 +    @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper

patches/server/Improve-performance-of-mass-crafts.patch

@@ -51,22 +51,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 @@ -0,0 +0,0 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-             RecipeHolder<T> recipeholder = (RecipeHolder) map.get(id);
+             RecipeHolder<T> recipeholder = this.byKeyTyped(type, id);
  
              if (recipeholder != null && recipeholder.value().matches(inventory, world)) {
 +                inventory.setCurrentRecipe(recipeholder); // Paper - Perf: Improve mass crafting
-                 return Optional.of(Pair.of(id, recipeholder));
+                 return Optional.of(recipeholder);
              }
          }
- 
-+        inventory.setCurrentRecipe(null); // Paper - Perf: Improve mass crafting;; clear before it might be set again
-         return map.entrySet().stream().filter((entry) -> {
-             return ((RecipeHolder) entry.getValue()).value().matches(inventory, world);
-         }).findFirst().map((entry) -> {
-+            inventory.setCurrentRecipe(entry.getValue()); // Paper - Perf: Improve mass crafting
-             return Pair.of((ResourceLocation) entry.getKey(), (RecipeHolder) entry.getValue());
-         });
-     }
 @@ -0,0 +0,0 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
      }
  

patches/server/Lag-compensation-ticks.patch

@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            worldserver.updateLagCompensationTick(); // Paper - lag compensation
  
              this.profiler.push(() -> {
-                 return worldserver + " " + worldserver.dimension().location();
+                 String s = String.valueOf(worldserver);
 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

patches/server/Optimise-chunk-tick-iteration.patch

@@ -79,17 +79,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
  
 @@ -0,0 +0,0 @@ public class ChunkHolder {
-                     int k = this.lightEngine.getMaxLightSection();
+                 int k = this.lightEngine.getMaxLightSection();
  
-                     if (y >= j && y <= k) {
+                 if (y >= j && y <= k) {
-+                        this.addToBroadcastMap(); // Paper - optimise chunk tick iteration
++                    this.addToBroadcastMap(); // Paper - optimise chunk tick iteration
-                         int l = y - j;
+                     int l = y - j;
  
-                         if (lightType == LightLayer.SKY) {
+                     if (lightType == LightLayer.SKY) {
 @@ -0,0 +0,0 @@ public class ChunkHolder {
-         }
+         this.broadcast(this.getPlayers(onChunkViewEdge), packet); // Paper - rewrite chunk system
      }
- 
+     // Paper end - starlight
 +    // Paper start - optimise chunk tick iteration
 +    public final boolean needsBroadcastChanges() {
 +        return this.hasChangedSections || !this.skyChangedLightSectionFilter.isEmpty() || !this.blockChangedLightSectionFilter.isEmpty();
@@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this.chunkMap.needsChangeBroadcasting.add(this);
 +    }
 +    // Paper end - optimise chunk tick iteration
-+
+ 
      public void broadcastChanges(LevelChunk chunk) {
 -        if (this.hasChangedSections || !this.skyChangedLightSectionFilter.isEmpty() || !this.blockChangedLightSectionFilter.isEmpty()) {
 +        if (this.needsBroadcastChanges()) { // Paper - optimise chunk tick iteration; moved into above, other logic needs to call
@@ -129,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end - optimise chunk tick iteration
  
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
-         super(session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync);
+         super(new RegionStorageInfo(session.getLevelId(), world.dimension(), "chunk"), session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync);
 @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
      // Paper end - Optional per player mob spawns
@@ -209,7 +209,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            }
 +            // Paper - optimise chunk tick iteration
  
-             if (this.level.getServer().tickRateManager().runsNormally()) {
+             if (this.level.tickRateManager().runsNormally()) {
                  gameprofilerfiller.popPush("naturalSpawnCount");
 @@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource {
                  gameprofilerfiller.popPush("spawnAndTick");

patches/server/Properly-resend-entities.patch

@@ -84,47 +84,6 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -0,0 +0,0 @@ import net.minecraft.nbt.CompoundTag;
- import net.minecraft.network.Connection;
- import net.minecraft.network.ConnectionProtocol;
- import net.minecraft.network.TickablePacketListener;
--import net.minecraft.network.chat.ChatDecorator;
- import net.minecraft.network.chat.ChatType;
- import net.minecraft.network.chat.Component;
- import net.minecraft.network.chat.LastSeenMessages;
-@@ -0,0 +0,0 @@ import net.minecraft.network.protocol.PacketUtils;
- import net.minecraft.network.protocol.common.ServerboundClientInformationPacket;
- import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
- import net.minecraft.network.protocol.configuration.ConfigurationProtocols;
--import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
- import net.minecraft.network.protocol.game.ClientboundBlockChangedAckPacket;
- import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
- import net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.block.entity.CrafterBlockEntity;
- import net.minecraft.world.level.block.entity.JigsawBlockEntity;
- import net.minecraft.world.level.block.entity.SignBlockEntity;
- import net.minecraft.world.level.block.entity.StructureBlockEntity;
--import net.minecraft.world.level.block.state.BlockBehaviour;
- import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.phys.AABB;
- import net.minecraft.world.phys.BlockHitResult;
-@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
- import org.bukkit.craftbukkit.event.CraftEventFactory;
- import org.bukkit.craftbukkit.inventory.CraftItemStack;
- import org.bukkit.craftbukkit.inventory.CraftItemType;
--import org.bukkit.craftbukkit.util.CraftChatMessage;
- import org.bukkit.craftbukkit.util.CraftNamespacedKey;
- import org.bukkit.craftbukkit.util.LazyPlayerSet;
- import org.bukkit.craftbukkit.util.Waitable;
-@@ -0,0 +0,0 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
- import org.bukkit.event.inventory.InventoryType.SlotType;
- import org.bukkit.event.inventory.SmithItemEvent;
- import org.bukkit.event.player.AsyncPlayerChatEvent;
--import org.bukkit.event.player.PlayerAnimationEvent;
--import org.bukkit.event.player.PlayerAnimationType;
- import org.bukkit.event.player.PlayerChatEvent;
- import org.bukkit.event.player.PlayerCommandPreprocessEvent;
- import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              }