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

Updated Upstream (Paper)

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

Paper Changes:
3aae7ef Updated Upstream (Bukkit/CraftBukkit)
4713937 Fix return value of Block#applyBoneMeal always being false (#6030)
This commit is contained in:
William Blake Galbreath
2021-06-28 22:07:35 -05:00
parent 76845665e6
commit cd5f184f6d
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13455,7 +13455,7 @@ index 9a428e166561b4bc028732ec563d3b2e99f81a8e..771c575ffe46db94d9c91f3fd0440d4d
private static JsonElement writeGameProfile(GameProfileCache.GameProfileInfo entry, DateFormat dateFormat) {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index a6ecbb7eb1df7923d58366327e0f00512a3a1677..d65ca67bb0d46ecd8a4003e44cfec71661679480 100644
index b46e64a386d256d30eac330c463c71396452563d..570cea8ee6a442b2dc3c6ef849294ef0c02027ca 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -175,6 +175,7 @@ public abstract class PlayerList {
@@ -16940,7 +16940,7 @@ index 40d6dfe30e8f388fb2014ba81f9ea4a986354b88..9de4b1c9402e78c661b4d2dc7d70439e
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b020d44f95ab8aafb270ca6e36abe86d6589fc9b..2aa45667054a721465f353f0500e30d90f7d16a4 100644
index 2ba3b01092cef23bcc958244992ef44103bc7e74..130a088e694b85f7d56620352f044161ea56caf3 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
@@ -16968,7 +16968,7 @@ index b020d44f95ab8aafb270ca6e36abe86d6589fc9b..2aa45667054a721465f353f0500e30d9
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2364,6 +2366,14 @@ public final class CraftServer implements Server {
@@ -2374,6 +2376,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

4
patches/server/0003-Purpur-config-files.patch
View File

@@ -461,7 +461,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c61ff190f04ac3d765d34f3eeb6a927d49f8d491..84858994a92380d71ae9c456853ab3ea54afa98e 100644
index 818dde63df240c7e72526ef0aef87c9f8739f78a..6329a85dbed1de21dd7dcde8b62d51f09da47e78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {
@@ -488,7 +488,7 @@ index c61ff190f04ac3d765d34f3eeb6a927d49f8d491..84858994a92380d71ae9c456853ab3ea
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2374,6 +2377,18 @@ public final class CraftServer implements Server {
@@ -2384,6 +2387,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report

4
patches/server/0011-Bring-back-server-name.patch
View File

@@ -17,10 +17,10 @@ index c9d80a5430cc66d6189bf337770af43121a5bfd5..329336d413317388455fbbf03036cee1
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 84858994a92380d71ae9c456853ab3ea54afa98e..8809e738bd0baa6ba18d57df14d9b95624d90d14 100644
index 6329a85dbed1de21dd7dcde8b62d51f09da47e78..b23d250c76236504e057f3a7e9e1d394a282812b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2543,4 +2543,11 @@ public final class CraftServer implements Server {
@@ -2553,4 +2553,11 @@ public final class CraftServer implements Server {
}
// Paper end

6
patches/server/0014-Lagging-threshold.patch
View File

@@ -25,7 +25,7 @@ index 0e0f7d48337f261481731917aabf45d8445121a0..34e364afff8cfe060244e5dd7cc0c340
}
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index df4f0573be672f15fedf896200206344995c333a..77b3f9165e74c4437ca863cc9c6cbe5771faee9e 100644
index bd8885362ddcad76d055612309257e310ba06718..615aa4230ae9eaa2f744dd039390637aaae01a91 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -152,6 +152,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index df4f0573be672f15fedf896200206344995c333a..77b3f9165e74c4437ca863cc9c6cbe57
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 8809e738bd0baa6ba18d57df14d9b95624d90d14..0b32e9acdc95ad27a43f20863aebf40fb33df207 100644
index b23d250c76236504e057f3a7e9e1d394a282812b..87cde1241a5ec525b8c1af127bf2e33c1dd87c4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2549,5 +2549,10 @@ public final class CraftServer implements Server {
@@ -2559,5 +2559,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

4
patches/server/0070-Add-5-second-tps-average-in-tps.patch
View File

@@ -69,10 +69,10 @@ index c5f1141d46acca284f5489d68d3b628e669950cb..9017d3626f4982a41d34d65758de4844
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0b32e9acdc95ad27a43f20863aebf40fb33df207..b0a7d903696f62360a0a0b4e1a9a50cc8e5cc027 100644
index 87cde1241a5ec525b8c1af127bf2e33c1dd87c4b..e6c77e7ecfa03f948423a68df0266210d0a0274d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2323,6 +2323,7 @@ public final class CraftServer implements Server {
@@ -2333,6 +2333,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {