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 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

6
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -6852,7 +6852,7 @@ index ff8ba54574..ecedc167db 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 93c0afbfba..61e5a91a74 100644
index 7d83cf39ae..2acdb08072 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -6880,7 +6880,7 @@ index 93c0afbfba..61e5a91a74 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1824,7 +1826,10 @@ public final class CraftServer implements Server {
@@ -1822,7 +1824,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -6892,7 +6892,7 @@ index 93c0afbfba..61e5a91a74 100644
}
@Override
@@ -2234,6 +2239,14 @@ public final class CraftServer implements Server {
@@ -2232,6 +2237,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}