Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
55e2de5c6 Improve per player mob spawning (#3971)
42433c262 Updated Upstream (Bukkit/CraftBukkit) (#3980)
e5ede546a Fix IDE Debug JVM Flag for 1.16 (#3983)
2712c6888 [Auto] Updated Upstream (Bukkit/CraftBukkit)
0901ffd04 Use title packet for actionbar methods (#3959)
2e11235d1 Expand MaterialTags (#3964)
cc25ae47c Amend last commit to fix decompile error forgot to commit
f503db37c Fix AdvancementDataPlayer leak due from quitting early in login
282763b88 Fix SPIGOT-5885 Unable to disable advancements
9b93d122e Fix SPIGOT-5824 Bukkit world-container is not used
bede4d304 Load config files early on

Tuinity Changes:
b0673b3 Merge dev/optimise-notify into ver/1.16
d3dc35c Name craft scheduler threads according to the plugin using them
This commit is contained in:
William Blake Galbreath
2020-07-23 15:37:14 -05:00
parent 436d723076
commit 8bc19e524a
44 changed files with 772 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0014-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 ba0260fa54..8ed47fe054 100644
index 47b453899..3e9cbafc8 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 ba0260fa54..8ed47fe054 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 27cbfdfba8..6ff5e07834 100644
index 27cbfdfba..6ff5e0783 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 27cbfdfba8..6ff5e07834 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 2eef042256..3079f9a161 100644
index 57a34fb96..233f4fb8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2402,5 +2402,10 @@ public final class CraftServer implements Server {
@@ -2409,5 +2409,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}