Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@20e9fe8e Fix javadocs in DriedGhast
PaperMC/Paper@1366eaa5 Readd dropped hunk
PaperMC/Paper@4b6fae10 1.21.6-pre2
PaperMC/Paper@5cfd6383 Fix compile issues
PaperMC/Paper@18924de7 run generator
PaperMC/Paper@fbc139e0 some fixes
PaperMC/Paper@0c3879ac track block for lava/conduit damage
PaperMC/Paper@767e99c9 Moonrise attempt
PaperMC/Paper@b15c51ce Rest of feature patches
PaperMC/Paper@c136222e Moonrise compile fixes and changes
PaperMC/Paper@52880cec Fix LayeredCauldronBlock event call
PaperMC/Paper@4fa21c21 Update Moonrise to 1.21.6-pre2
PaperMC/Paper@cb705c41 Add DataConverter patch
PaperMC/Paper@87b3d8ba Replace deprecated Thread#getId usage with Thread#threadId
PaperMC/Paper@5b362692 Add MCUtil#toLocation from Folia
PaperMC/Paper@b2f3c2c9 Move over to non discarding reporter
PaperMC/Paper@4c4ddfcc Update ItemType
This commit is contained in:
granny
2025-06-03 22:14:04 -07:00
parent 1505068927
commit 2a46cfc530
31 changed files with 154 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -103,6 +_,18 @@
@@ -108,6 +_,18 @@
this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
}

2
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -487,7 +_,7 @@
@@ -491,7 +_,7 @@
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

4
purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch
View File

@@ -38,9 +38,9 @@
// Paper end - Different message for short timeout
logger.log(Level.SEVERE, "------------------------------");
- logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):"); // Paper
+ logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur - Rebrand
+ logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):"); // Paper // Purpur - Rebrand
FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information
WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE), logger);
WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger);
logger.log(Level.SEVERE, "------------------------------");
@@ -120,7 +_,7 @@
WatchdogThread.dumpThread(thread, logger);