Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@14136b8 Updated Upstream (Paper) PurpurMC/Purpur@458dc18 Updated Upstream (Paper), closes #1556 PurpurMC/Purpur@87cf9f1 Updated Upstream (Paper)
2026-01-04 15:31:43 +00:00 · 2024-07-15 22:11:50 +03:00
parent ab36993ed2
commit 600e35e6e9
5 changed files with 13 additions and 13 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = space.bxteam.divinemc

 mcVersion = 1.21
 version = 1.21-R0.1-SNAPSHOT
-purpurRef = 5e70800f8078f30dcddf864dc565ac347653311f
+purpurRef = 87cf9f15dc468169a0350d678bf1fdc036eeaf33

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/server/0001-Divine-Branding.patch
+++ b/patches/server/0001-Divine-Branding.patch
@@ -293,10 +293,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..7bbbdf2895776f12ebc153dc83f4d53b
 
         if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index abe225593d325afee56f5b3a8f75aafc42a4560b..ac4aac17b20a43eeca2338850868a29540f0d0a9 100644
+index 08230ef6a705904440a677fba4c65386a3f540ed..5cf7b386dd665591597d58dd92ee3612df04b759 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -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, "------------------------------" );
@@ -314,7 +314,7 @@ index abe225593d325afee56f5b3a8f75aafc42a4560b..ac4aac17b20a43eeca2338850868a295
                 //
                 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
                 {
@@ -329,7 +329,7 @@ index abe225593d325afee56f5b3a8f75aafc42a4560b..ac4aac17b20a43eeca2338850868a295
                 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 {
--- a/patches/server/0002-Divine-Configuration.patch
+++ b/patches/server/0002-Divine-Configuration.patch
@@ -34,7 +34,7 @@ index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee66
         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
         this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9571f6fc685fff5f4be469099ce8e6c85292a53a..1adb68952ca18e9d3d5c382cd6bc5976f5c98660 100644
+index 5ab33a2531cd7853d4a33fa1569d0181d967bac6..2dec9557c6f9e33b4cecb5c53ce3fa3ff2304c15 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -83,6 +83,7 @@ import net.minecraft.world.phys.AABB;
@@ -53,7 +53,7 @@ index 9571f6fc685fff5f4be469099ce8e6c85292a53a..1adb68952ca18e9d3d5c382cd6bc5976
     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
     public static BlockPos lastPhysicsProblem; // Spigot
     private org.spigotmc.TickLimiter entityLimiter;
-@@ -688,6 +690,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -690,6 +692,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
--- a/patches/server/0025-Remove-Spigot-tick-limiter.patch
+++ b/patches/server/0025-Remove-Spigot-tick-limiter.patch
@@ -7,7 +7,7 @@ Original code by Titaniumtown, modified by NONPLAYT
 You can find the original code on https://gitlab.com/Titaniumtown/JettPack

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1adb68952ca18e9d3d5c382cd6bc5976f5c98660..ec7e7d0f4e50fa14aa9513ad36af9a7dd64d02a3 100644
+index 2dec9557c6f9e33b4cecb5c53ce3fa3ff2304c15..2e60f4d92b8d26eff7efe9c99480c33649bec789 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -178,8 +178,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -19,7 +19,7 @@ index 1adb68952ca18e9d3d5c382cd6bc5976f5c98660..ec7e7d0f4e50fa14aa9513ad36af9a7d
     private int tileTickPosition;
     public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
     public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
-@@ -769,8 +767,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -771,8 +769,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
         });
         // CraftBukkit end
         this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
--- a/patches/server/0028-Delete-Timings.patch
+++ b/patches/server/0028-Delete-Timings.patch
@@ -939,7 +939,7 @@ index c0e19a44de942ed82cdcd5bb1688be2b4cbc0d23..49cd0d502a897b32c185e1437d8fb7eb
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.Iterables;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b3ddd5eba13f03d30104c9a163da835126b29115..dacec2cc57d0de60430bd82d6bca137259dc6a06 100644
+index 0f28eabc50366f35b3804b16db8cc4c38777de6e..60a0977aaa43025e22fb7014ceee3d7dd729a3e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@
@@ -1061,7 +1061,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
         this.scanRate = senseInterval;
         this.timeToTick = (long)RANDOM.nextInt(senseInterval);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ec7e7d0f4e50fa14aa9513ad36af9a7dd64d02a3..7246dfe88f36c261e5780cd5a0958bbb887e1e71 100644
+index 2e60f4d92b8d26eff7efe9c99480c33649bec789..16cd246d7d24a211c09b13aedf2286cb3fdf3c49 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1072,7 +1072,7 @@ index ec7e7d0f4e50fa14aa9513ad36af9a7dd64d02a3..7246dfe88f36c261e5780cd5a0958bbb
     public static BlockPos lastPhysicsProblem; // Spigot
     private int tileTickPosition;
     public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
-@@ -766,7 +765,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -768,7 +767,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
             public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
         });
         // CraftBukkit end
@@ -1080,7 +1080,7 @@ index ec7e7d0f4e50fa14aa9513ad36af9a7dd64d02a3..7246dfe88f36c261e5780cd5a0958bbb
         this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
         // Paper start - optimise collisions
         this.minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(this);
-@@ -1409,9 +1407,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1411,9 +1409,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
         }
         this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075