Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@dd216c1 Fix Inconsistencies with Paper Plugin Names (#9098)
PaperMC/Paper@beed22d Undo making JavaPlugin#logger field public (#9125)
PaperMC/Paper@f7717c3 Fix server ignoring fallback for translatable components (#9134)
This commit is contained in:
granny
2023-04-20 19:26:41 -07:00
parent a495371bb7
commit 678eafef72
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0016-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d728e115c57ecf26c960e5130135c8875007dd48..c4f8caf7001bb022117466ce723a9ac3ada03d6b 100644
index 57f6de7872bfa80cf7668524975946cbd7fcda56..6cdcd4f105b15f10d60499572f6f4f830565513e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index d728e115c57ecf26c960e5130135c8875007dd48..c4f8caf7001bb022117466ce723a9ac3
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3ed3375c327f426c8e20efde000806a8b4bfa24d..c6067c4446ee5c531bc2c855ebd0c9cb2e3dada8 100644
index 3c7ef6dc1306c144de74cd540d509f67716ff434..9c949e2e7d2d25f0012b3e7bc2e054cac42230a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2945,5 +2945,10 @@ public final class CraftServer implements Server {
@@ -2941,5 +2941,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}