mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
This commit is contained in:
@@ -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 f57a3ae11fdffb5fcd13a1caaf65a480c934eca1..4f861e07fc15f43ddfb8d48499be8ec8f09c5480 100644
|
||||
index bb573e6aac01410c3e5972705aa260329ebe6ed5..3435ae0e03ebd041de2483b03e931fbfa60c2cb7 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -319,6 +319,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -25,10 +25,10 @@ index f57a3ae11fdffb5fcd13a1caaf65a480c934eca1..4f861e07fc15f43ddfb8d48499be8ec8
|
||||
}
|
||||
// Paper end - further improve server tick loop
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 90e12b1eb1180d066e7162bef0adeb9d3dec8721..3afa845c073aec1f60a932dc825f53383252e812 100644
|
||||
index 0a752846d86e0383b61e7a631be4b7448a67d4bd..650a8519b866b6b261772301a32ae3eacabb2a6d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -3226,5 +3226,10 @@ public final class CraftServer implements Server {
|
||||
@@ -3235,5 +3235,10 @@ public final class CraftServer implements Server {
|
||||
public String getServerName() {
|
||||
return this.getProperties().serverName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user