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

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.17-R0.1-SNAPSHOT
mcVersion = 1.17
packageVersion = 1_17_R1
paperCommit = 143f38113e3e5de75114490b213b6714d4111176
paperCommit = 47139376c468fad9261343a3806e241c23a9d4c3
org.gradle.parallel = true
org.gradle.vfs.watch = false

4
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e88b47a838dc472ad64271a518ee1789f7be19fa..f55ae8275c297c4c86215fba8d7197ffe9715879 100644
index 07c9635ea2e09e823ed7fa164ed854af41fab7dc..8482c4a664a02614fd59f74a4f9dd6d2e32003f5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1606,6 +1606,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1626,6 +1626,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f55ae8275c297c4c86215fba8d7197ffe9715879..0888165f2327bad2125d9cbe9b72e3282d44e072 100644
index 8482c4a664a02614fd59f74a4f9dd6d2e32003f5..f5c48ce541876a623445e1a99fc55f101c2b3fc8 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1614,6 +1614,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1634,6 +1634,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Tuinity end - add config to timings report

8
patches/api/0010-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b5158151960db5c474b3aaa24bfa428e2a158fd9..d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98 100644
index 001d6e4f6d9d91c6929ae84c53dbd23c6c8112c9..93daff9e8a75c2019a907577841f6eeddaabb5e1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1982,4 +1982,15 @@ public final class Bukkit {
@@ -2006,4 +2006,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index b5158151960db5c474b3aaa24bfa428e2a158fd9..d6fe8f2bd2e648b54f0ca6f5d49587d2
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0888165f2327bad2125d9cbe9b72e3282d44e072..eebaee3f3e01f39c0378cc89381eb97d95f31152 100644
index f5c48ce541876a623445e1a99fc55f101c2b3fc8..f8ee62ed450f52bc3a321ff75a36b9778f0f91b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1736,4 +1736,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1756,4 +1756,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
io.papermc.paper.datapack.DatapackManager getDatapackManager();
// Paper end

8
patches/api/0013-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 d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884f4811717 100644
index 93daff9e8a75c2019a907577841f6eeddaabb5e1..bf86f402bc099ee190c809220f211ed59b3e9613 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1992,5 +1992,14 @@ public final class Bukkit {
@@ -2016,5 +2016,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index eebaee3f3e01f39c0378cc89381eb97d95f31152..f24d00951cd6951023f1ff34312ae0438107fc22 100644
index f8ee62ed450f52bc3a321ff75a36b9778f0f91b5..bab0c0d660a01e912d0a88aefbacf20895f4ef61 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1744,5 +1744,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1764,5 +1764,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

4
patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f24d00951cd6951023f1ff34312ae0438107fc22..3ee71225eb67ec728b414a8cdc0570d48d5603e3 100644
index bab0c0d660a01e912d0a88aefbacf20895f4ef61..5fcf5e0e746d579b6c3abf7148554463770332bd 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1579,6 +1579,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1599,6 +1599,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
UnsafeValues getUnsafe();
// Spigot start

32
patches/api/0038-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Conflict on change for adventure deprecations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff15333036e 100644
index bf86f402bc099ee190c809220f211ed59b3e9613..82978d66cc7d6214cf84f566918bfaf6bcbe1118 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -322,7 +322,7 @@ public final class Bukkit {
@@ -346,7 +346,7 @@ public final class Bukkit {
* @return the number of players
* @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)}
*/
@@ -17,7 +17,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -966,7 +966,7 @@ public final class Bukkit {
@@ -990,7 +990,7 @@ public final class Bukkit {
* @return number of message recipients
* @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
*/
@@ -26,7 +26,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1243,7 +1243,7 @@ public final class Bukkit {
@@ -1267,7 +1267,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1293,7 +1293,7 @@ public final class Bukkit {
@@ -1317,7 +1317,7 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
*/
@@ -44,7 +44,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1320,7 +1320,7 @@ public final class Bukkit {
@@ -1344,7 +1344,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1409,7 +1409,7 @@ public final class Bukkit {
@@ -1433,7 +1433,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
public static String getMotd() {
return server.getMotd();
}
@@ -1431,7 +1431,7 @@ public final class Bukkit {
@@ -1455,7 +1455,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,10 +72,10 @@ index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff1
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059c9dd9526 100644
index 5fcf5e0e746d579b6c3abf7148554463770332bd..2f9ee4cf3b2163dbe086b4d40179bfa64ebfdecf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -250,7 +250,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -270,7 +270,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the number of players
* @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
*/
@@ -84,7 +84,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
public int broadcastMessage(@NotNull String message);
// Paper start
@@ -773,7 +773,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -793,7 +793,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return number of message recipients
* @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
*/
@@ -93,7 +93,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1035,7 +1035,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1055,7 +1055,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1079,7 +1079,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1099,7 +1099,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
*/
@@ -111,7 +111,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1102,7 +1102,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1122,7 +1122,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -120,7 +120,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
Merchant createMerchant(@Nullable String title);
/**
@@ -1175,7 +1175,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1195,7 +1195,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index 3ee71225eb67ec728b414a8cdc0570d48d5603e3..a7fcd00ae37f9a2026759642562b1059
String getMotd();
// Paper start
@@ -1193,7 +1193,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1213,7 +1213,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable

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[] {