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 & 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/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 40c8de479..be99ddd5e 100644
index 9abb3ba7f..60746ff04 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1775,5 +1775,14 @@ public final class Bukkit {
@@ -1786,5 +1786,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 40c8de479..be99ddd5e 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e21ce51d5..cde8376e2 100644
index 1f44ee201..1b743968b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1566,5 +1566,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1575,5 +1575,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();