From 458dc187f992d8d0baa142d3687a97ee647ddc5f Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 14 Jul 2024 20:33:40 -0700 Subject: [PATCH] Updated Upstream (Paper), closes #1556 Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2288e13 Update last chunk position in findSupportingBlock PaperMC/Paper@1595e4a Make watchdog thread extend TickThread again PaperMC/Paper@34a2917 Add default canUse and permission methods to BasicCommand (#11047) PaperMC/Paper@99ae7bb Don't require author and title to be set on signed book meta (#11068) --- gradle.properties | 2 +- patches/server/0001-Rebrand.patch | 10 +++++----- patches/server/0002-Purpur-config-files.patch | 4 ++-- .../0067-Add-allow-water-in-end-world-option.patch | 4 ++-- ...-Add-adjustable-breeding-cooldown-to-config.patch | 4 ++-- patches/server/0250-Remove-Timings.patch | 6 +++--- patches/server/0251-Remove-Mojang-Profiler.patch | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index e59d14d81..37c68d84d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21-R0.1-SNAPSHOT mcVersion = 1.21 -paperCommit = 5a503d7db42eee8d287b7ed32db22a369e9e3146 +paperCommit = 99ae7bbc9760e02fbd5388ad3890258203ee6d5a org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 13c4aa9f0..ac55ba70f 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -293,10 +293,10 @@ index 774556a62eb240da42e84db4502e2ed43495be17..99597258e8e88cd9e2c901c4ac3ff7fa if (stream != null) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc42a4560b 100644 +index 5e583d7226ce60d965ce9f019900793d45742d30..08230ef6a705904440a677fba4c65386a3f540ed 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java -@@ -96,7 +96,7 @@ public class WatchdogThread extends Thread +@@ -96,7 +96,7 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - private WatchdogThread(long timeoutTime, boolean restart) { @@ -305,7 +305,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc this.timeoutTime = timeoutTime; this.restart = restart; earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper -@@ -155,14 +155,14 @@ public class WatchdogThread extends Thread +@@ -155,14 +155,14 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - if (isLongTimeout) { // Paper end log.log( Level.SEVERE, "------------------------------" ); @@ -323,7 +323,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc // if ( net.minecraft.world.level.Level.lastPhysicsProblem != null ) { -@@ -184,12 +184,12 @@ public class WatchdogThread extends Thread +@@ -184,12 +184,12 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - // Paper end } else { @@ -338,7 +338,7 @@ index f947b542b21189ab8324d54d965364aa283d7cb7..abe225593d325afee56f5b3a8f75aafc ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system this.dumpTickingInfo(); // Paper - log detailed tick information WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); -@@ -205,7 +205,7 @@ public class WatchdogThread extends Thread +@@ -205,7 +205,7 @@ public class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - WatchdogThread.dumpThread( thread, log ); } } else { diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index d98fe7b0b..635a07f95 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -92,7 +92,7 @@ index 7d82cc6b847124cf4225428ba310309544928148..04fd1172b47a74b16955cf93fc20f64f this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c1f392cd7928a142192c87cf46ef2a4fc2495562..cafb46e4ab35b5c9c4b22f9cc4970384c77e6dda 100644 +index b16c3beda0fc7d7d06cfc82f450165096a88bade..304e6c2f50d4424a2fb03fbc91df50a7f1516e70 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -103,7 +103,7 @@ index c1f392cd7928a142192c87cf46ef2a4fc2495562..cafb46e4ab35b5c9c4b22f9cc4970384 public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -643,6 +644,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -645,6 +646,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config & Anti-Xray this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config diff --git a/patches/server/0067-Add-allow-water-in-end-world-option.patch b/patches/server/0067-Add-allow-water-in-end-world-option.patch index a3110b850..c4a676819 100644 --- a/patches/server/0067-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0067-Add-allow-water-in-end-world-option.patch @@ -27,10 +27,10 @@ index 321188173918d0d60858a258400dfd682ccdb21c..af47074f3a61a8518697d7851e43d543 return true; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index cafb46e4ab35b5c9c4b22f9cc4970384c77e6dda..6f727c017a0f29e140320fc72700fd43cd91eb28 100644 +index 304e6c2f50d4424a2fb03fbc91df50a7f1516e70..df3a8b3e0f21fe6b8ec850c5ccd6a0d5a513b57b 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1982,4 +1982,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1984,4 +1984,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl return null; } // Paper end - optimize redstone (Alternate Current) diff --git a/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch index 7762a3fe4..1135b5d50 100644 --- a/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0095-Add-adjustable-breeding-cooldown-to-config.patch @@ -42,7 +42,7 @@ index 1808e1b01afa3041a54c9c9a7586d4d61960527a..5b523f3fa323378a8f96f58a9e252d2e EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience); if (entityBreedEvent.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 6f727c017a0f29e140320fc72700fd43cd91eb28..e88e450dfcccfc8f9447289ba23f8d6eb61b5d66 100644 +index df3a8b3e0f21fe6b8ec850c5ccd6a0d5a513b57b..d61634dba1024ece540d79b64e013259502f7ca2 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -182,6 +182,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -95,7 +95,7 @@ index 6f727c017a0f29e140320fc72700fd43cd91eb28..e88e450dfcccfc8f9447289ba23f8d6e public CraftWorld getWorld() { return this.world; } -@@ -645,6 +688,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -647,6 +690,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur diff --git a/patches/server/0250-Remove-Timings.patch b/patches/server/0250-Remove-Timings.patch index 8ee002f39..f255c673b 100644 --- a/patches/server/0250-Remove-Timings.patch +++ b/patches/server/0250-Remove-Timings.patch @@ -558,10 +558,10 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..09a7b418ddf564c0be13297f7c216db2 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e88e450dfcccfc8f9447289ba23f8d6eb61b5d66..56f25ccd82d53c1f7e260819b660b02c7f5e133f 100644 +index d61634dba1024ece540d79b64e013259502f7ca2..63d1f787f5cd4af900d22e2abba32ba52b615737 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1371,15 +1371,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1373,15 +1373,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl ProfilerFiller gameprofilerfiller = this.getProfiler(); gameprofilerfiller.push("blockEntities"); @@ -580,7 +580,7 @@ index e88e450dfcccfc8f9447289ba23f8d6eb61b5d66..56f25ccd82d53c1f7e260819b660b02c // Spigot start // Iterator iterator = this.blockEntityTickers.iterator(); boolean flag = this.tickRateManager().runsNormally(); -@@ -1410,7 +1410,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1412,7 +1412,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl } this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 diff --git a/patches/server/0251-Remove-Mojang-Profiler.patch b/patches/server/0251-Remove-Mojang-Profiler.patch index 96f7ad429..613aafb4a 100644 --- a/patches/server/0251-Remove-Mojang-Profiler.patch +++ b/patches/server/0251-Remove-Mojang-Profiler.patch @@ -1806,7 +1806,7 @@ index a248d859cbce48f4a34c4771a7acffc17d7edc84..4ce32603dcd691e018a3e1962311d2ac if (this.fire) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c85292a53a 100644 +index 63d1f787f5cd4af900d22e2abba32ba52b615737..5ab33a2531cd7853d4a33fa1569d0181d967bac6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -269,7 +269,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -1827,7 +1827,7 @@ index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c8 final List ret = new java.util.ArrayList<>(); ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel)this).moonrise$getEntityLookup().getHardCollidingEntities(entity, box, ret, predicate); -@@ -1368,9 +1368,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1370,9 +1370,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl } protected void tickBlockEntities() { @@ -1839,7 +1839,7 @@ index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c8 //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { -@@ -1413,7 +1413,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1415,7 +1415,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur this.tickingBlockEntities = false; co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper @@ -1848,7 +1848,7 @@ index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c8 this.spigotConfig.currentPrimedTnt = 0; // Spigot } -@@ -1625,7 +1625,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1627,7 +1627,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @Override public List getEntities(@Nullable Entity except, AABB box, Predicate predicate) { @@ -1857,7 +1857,7 @@ index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c8 // Paper start - rewrite chunk system final List ret = new java.util.ArrayList<>(); -@@ -1651,7 +1651,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1653,7 +1653,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public void getEntities(final EntityTypeTest entityTypeTest, final AABB boundingBox, final Predicate predicate, final List into, final int maxCount) { @@ -1866,7 +1866,7 @@ index 56f25ccd82d53c1f7e260819b660b02c7f5e133f..9571f6fc685fff5f4be469099ce8e6c8 if (entityTypeTest instanceof net.minecraft.world.entity.EntityType byType) { if (maxCount != Integer.MAX_VALUE) { -@@ -1946,6 +1946,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl +@@ -1948,6 +1948,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl } public ProfilerFiller getProfiler() {