More work work work work work work work work work

patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch → patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce worldgen thread worker count for low core count CPUs
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 5579dad0ba8f2e4ce43883e7d36059c2a2bd1b83..fcade0a121f155dbf4f5f8af66240923d8da460d 100644
+index 25b2d7016b60ee9bad0a2fb4a2c7c8ee34af50eb..a17e61f6f59eae179b76179985a9bd7a32a7e40a 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -147,7 +147,19 @@ public class Util {
+@@ -148,7 +148,19 @@ public class Util {
 
      private static ExecutorService makeExecutor(String s, int priorityModifier) { // Paper - add priority
          // Paper start - use simpler thread pool that allows 1 thread

patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch → patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 84ef33f700d3205d934802dceb4a2279df00adb0..b00c1df57789996fef58b2c649588c13df149abd 100644
+index c7d53adc060e67eb2036f2db6e5da36cacab2a95..a5df34df91dbad954d9990b6b6c8000266746d04 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2737,6 +2737,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2364,6 +2364,11 @@ 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/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch → patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch

@@ -6,12 +6,12 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ee5cb4efcf5e63321e34cea77afa6af7b402b651..31c8b483006febd23363f7bcc2c09bde37b84847 100644
+index 87c9e00cf85809bb40ca043f56b6f180ae08269c..67f2de8c2ad186fb6fa6cf68a87964f687605c64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -849,6 +849,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -727,6 +727,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+             return;
          }
-         // Paper end
          // CraftBukkit end
 +        // Paper start - Don't suggest if tab-complete is disabled
 +        if (org.spigotmc.SpigotConfig.tabComplete < 0) {

patches/unapplied/server/0714-Ensure-valid-vehicle-status.patch → patches/server/0693-Ensure-valid-vehicle-status.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6c00162847b59ffa3d1403b956545c57ba539139..52dba7fad11a7280137ade67983e594487e20891 100644
+index 46101c122bd5a31b24a24769dd4450b27df23555..6974a1a4c1142339dffedfd4e0205103274bfa5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -568,7 +568,7 @@ public class ServerPlayer extends Player {
+@@ -526,7 +526,7 @@ public class ServerPlayer extends Player {
              }
          }
 

patches/unapplied/server/0715-Prevent-softlocked-end-exit-portal-generation.patch → patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent softlocked end exit portal generation
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 5c0767a0bc37b5f0aa3f8892826e58f93f11cf97..294f384326c01d28c28908a56905b925b1b3bd76 100644
+index c29ccc66c95faba425acb0ca06af15e2783b4bae..44f799d595d7150f00dfdfa2f85c87386f896607 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -466,6 +466,11 @@ public class EndDragonFight {
@@ -17,6 +17,6 @@ index 5c0767a0bc37b5f0aa3f8892826e58f93f11cf97..294f384326c01d28c28908a56905b925
 +            this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
 +        }
 +        // Paper end
-         worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation);
-     }
+         if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
+             int i = Mth.positiveCeilDiv(4, 16);
 

patches/unapplied/server/0719-Preserve-overstacked-loot.patch → patches/server/0698-Preserve-overstacked-loot.patch

@@ -10,10 +10,10 @@ chunk bans via the large amount of NBT created by unstacking the items.
 Fixes GH-5140 and GH-4748.
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index d123bd7095355dff84b9859657e24258c5a204e3..e46a0afa45ee771a0114703acc314d7cf8e8ffed 100644
+index c21dd258d749c28e509c86a70c1f85712aeeda9e..5373070034cefbbfa797c675ce698637b526a2c8 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-@@ -62,9 +62,10 @@ public class LootTable {
+@@ -67,9 +67,10 @@ public class LootTable {
      }
 
      public static Consumer<ItemStack> createStackSplitter(ServerLevel world, Consumer<ItemStack> consumer) {

patches/unapplied/server/0720-Update-head-rotation-in-missing-places.patch → patches/server/0699-Update-head-rotation-in-missing-places.patch

@@ -8,18 +8,18 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0e494502bc6d52f277d240d839e02b51fccf05fc..61a3f7984e798191c74e85a514ca1ecde70e03ba 100644
+index d3f7541d3ddfec80464fb060051f4fefd033b41d..2487452f4ac5665208691eaeb68b91f116a2d231 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1903,6 +1903,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1785,6 +1785,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
 +        this.setYHeadRot(yaw); // Paper - Update head rotation
      }
 
      public void absMoveTo(double x, double y, double z) {
-@@ -1941,6 +1942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1823,6 +1824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();