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

Updated Upstream (Paper)

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

Paper Changes:
47740f67 Updated Upstream (CraftBukkit)
948c20e0 Merge remote-tracking branch 'origin/master' into progress/1.16.2
60a5ca6d Fix regex mistake in CB NBT int deserialization (#4146)
This commit is contained in:
William Blake Galbreath
2020-08-17 21:10:02 -05:00
parent fc99d9cbbd
commit cae1e7eb26
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0015-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 5b684affd..eee7356d5 100644
index 5b684affda..eee7356d5b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -25,7 +25,7 @@ index 5b684affd..eee7356d5 100644
}
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 27cbfdfba..6ff5e0783 100644
index 27cbfdfba8..6ff5e07834 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index 27cbfdfba..6ff5e0783 100644
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d56742df3..f8176cac4 100644
index e0ac9822e4..ebc87f1c5c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2405,5 +2405,10 @@ public final class CraftServer implements Server {
@@ -2403,5 +2403,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}