[ci skip] Add more identifying patch comments, merge related patches

2024-01-19 13:22:30 +01:00
parent b5b92e90d8
commit 64e5ff904c
46 changed files with 242 additions and 290 deletions
--- a/patches/server/Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/Use-correct-seed-on-api-world-load.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
 
-         // Paper - move down
+         // Paper - fix and optimise world upgrading; move down
 
 -        long j = BiomeManager.obfuscateSeed(creator.seed());
 +        long j = BiomeManager.obfuscateSeed(worlddata.worldGenOptions().seed()); // Paper - use world seed