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