From 2617c927a08bcfd5555d23a40a05c7dab996de6c Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 22 Sep 2023 16:42:56 +0200 Subject: [PATCH] More work work work work work work work work work --- ...uce-worldgen-thread-worker-count-for-low-core-cou.patch} | 4 ++-- ...atch => 0688-Fix-Bukkit-NamespacedKey-shenanigans.patch} | 0 ...-merchant-inventory-not-closing-on-entity-removal.patch} | 4 ++-- ...90-Check-requirement-before-suggesting-root-nodes.patch} | 0 ...-t-respond-to-ServerboundCommandSuggestionPacket-.patch} | 6 +++--- ...-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} | 0 .../0693-Ensure-valid-vehicle-status.patch} | 4 ++-- ...694-Prevent-softlocked-end-exit-portal-generation.patch} | 6 +++--- ...-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} | 0 .../0696-Don-t-log-debug-logging-being-disabled.patch} | 0 .../0697-fix-various-menus-with-empty-level-accesses.patch} | 0 .../0698-Preserve-overstacked-loot.patch} | 4 ++-- .../0699-Update-head-rotation-in-missing-places.patch} | 6 +++--- .../0700-prevent-unintended-light-block-manipulation.patch} | 0 .../0701-Fix-CraftCriteria-defaults-map.patch} | 0 .../0702-Fix-upstreams-block-state-factories.patch} | 0 16 files changed, 17 insertions(+), 17 deletions(-) rename patches/server/{0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (90%) rename patches/server/{0709-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0688-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%) rename patches/server/{0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (90%) rename patches/server/{0711-Check-requirement-before-suggesting-root-nodes.patch => 0690-Check-requirement-before-suggesting-root-nodes.patch} (100%) rename patches/server/{0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (82%) rename patches/server/{0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%) rename patches/{unapplied/server/0714-Ensure-valid-vehicle-status.patch => server/0693-Ensure-valid-vehicle-status.patch} (84%) rename patches/{unapplied/server/0715-Prevent-softlocked-end-exit-portal-generation.patch => server/0694-Prevent-softlocked-end-exit-portal-generation.patch} (74%) rename patches/{unapplied/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%) rename patches/{unapplied/server/0717-Don-t-log-debug-logging-being-disabled.patch => server/0696-Don-t-log-debug-logging-being-disabled.patch} (100%) rename patches/{unapplied/server/0718-fix-various-menus-with-empty-level-accesses.patch => server/0697-fix-various-menus-with-empty-level-accesses.patch} (100%) rename patches/{unapplied/server/0719-Preserve-overstacked-loot.patch => server/0698-Preserve-overstacked-loot.patch} (91%) rename patches/{unapplied/server/0720-Update-head-rotation-in-missing-places.patch => server/0699-Update-head-rotation-in-missing-places.patch} (84%) rename patches/{unapplied/server/0721-prevent-unintended-light-block-manipulation.patch => server/0700-prevent-unintended-light-block-manipulation.patch} (100%) rename patches/{unapplied/server/0722-Fix-CraftCriteria-defaults-map.patch => server/0701-Fix-CraftCriteria-defaults-map.patch} (100%) rename patches/{unapplied/server/0723-Fix-upstreams-block-state-factories.patch => server/0702-Fix-upstreams-block-state-factories.patch} (100%) diff --git a/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 90% rename from patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch index 125dc57c81..429df0d968 100644 --- a/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch +++ b/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 diff --git a/patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0688-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 90% rename from patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0689-Fix-merchant-inventory-not-closing-on-entity-removal.patch index 175e6eef47..7190e1c558 100644 --- a/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/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 diff --git a/patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0690-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0690-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 82% rename from patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0691-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 19ef21f706..706c02dc48 100644 --- a/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/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) { diff --git a/patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0692-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/unapplied/server/0714-Ensure-valid-vehicle-status.patch b/patches/server/0693-Ensure-valid-vehicle-status.patch similarity index 84% rename from patches/unapplied/server/0714-Ensure-valid-vehicle-status.patch rename to patches/server/0693-Ensure-valid-vehicle-status.patch index b93e7048fc..88774868dc 100644 --- a/patches/unapplied/server/0714-Ensure-valid-vehicle-status.patch +++ b/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 { } } diff --git a/patches/unapplied/server/0715-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch similarity index 74% rename from patches/unapplied/server/0715-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0694-Prevent-softlocked-end-exit-portal-generation.patch index 151284d784..df49391139 100644 --- a/patches/unapplied/server/0715-Prevent-softlocked-end-exit-portal-generation.patch +++ b/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); diff --git a/patches/unapplied/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/unapplied/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/unapplied/server/0717-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0696-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/unapplied/server/0717-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0696-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/unapplied/server/0718-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0697-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/unapplied/server/0718-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0697-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/unapplied/server/0719-Preserve-overstacked-loot.patch b/patches/server/0698-Preserve-overstacked-loot.patch similarity index 91% rename from patches/unapplied/server/0719-Preserve-overstacked-loot.patch rename to patches/server/0698-Preserve-overstacked-loot.patch index 940c8f47ca..45b5a6355e 100644 --- a/patches/unapplied/server/0719-Preserve-overstacked-loot.patch +++ b/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 createStackSplitter(ServerLevel world, Consumer consumer) { diff --git a/patches/unapplied/server/0720-Update-head-rotation-in-missing-places.patch b/patches/server/0699-Update-head-rotation-in-missing-places.patch similarity index 84% rename from patches/unapplied/server/0720-Update-head-rotation-in-missing-places.patch rename to patches/server/0699-Update-head-rotation-in-missing-places.patch index 25a0828fd0..db4808a7f4 100644 --- a/patches/unapplied/server/0720-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0699-Update-head-rotation-in-missing-places.patch @@ -8,10 +8,10 @@ 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(); @@ -19,7 +19,7 @@ index 0e494502bc6d52f277d240d839e02b51fccf05fc..61a3f7984e798191c74e85a514ca1ecd } 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(); diff --git a/patches/unapplied/server/0721-prevent-unintended-light-block-manipulation.patch b/patches/server/0700-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/unapplied/server/0721-prevent-unintended-light-block-manipulation.patch rename to patches/server/0700-prevent-unintended-light-block-manipulation.patch diff --git a/patches/unapplied/server/0722-Fix-CraftCriteria-defaults-map.patch b/patches/server/0701-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/unapplied/server/0722-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0701-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/unapplied/server/0723-Fix-upstreams-block-state-factories.patch b/patches/server/0702-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/unapplied/server/0723-Fix-upstreams-block-state-factories.patch rename to patches/server/0702-Fix-upstreams-block-state-factories.patch