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:
a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965)
b1f6e26 Fix mobs not burning from summon command (#5961)
4e2f0be Refactor Anti-Xray and make some fixes to it (#5938)
d50cc01 Make gradle take build number from env vars and add git build info (#5890)
This commit is contained in:
William Blake Galbreath
2021-06-23 16:46:21 -05:00
parent 0babd7cad8
commit 921a000994
13 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0009-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 e8414592b3afeb1e5db2b817b8fb7c13e073b9aa..281c5a72cf59dd5cb3dee47541641483d434aeb0 100644
index b5158151960db5c474b3aaa24bfa428e2a158fd9..d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1963,4 +1963,15 @@ public final class Bukkit {
@@ -1982,4 +1982,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}

4
patches/api/0012-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 281c5a72cf59dd5cb3dee47541641483d434aeb0..a60c8bd89d14e47d3243307241458e907249a99b 100644
index d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884f4811717 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1973,5 +1973,14 @@ public final class Bukkit {
@@ -1992,5 +1992,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}

16
patches/api/0037-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 a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0acf61b19 100644
index 047b6b3d037ccdc9c83d8f46d5469884f4811717..7354aed0a328d1eab59f29d12d401ff15333036e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -303,7 +303,7 @@ public final class Bukkit {
@@ -322,7 +322,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 a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -947,7 +947,7 @@ public final class Bukkit {
@@ -966,7 +966,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 a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1224,7 +1224,7 @@ public final class Bukkit {
@@ -1243,7 +1243,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1274,7 +1274,7 @@ public final class Bukkit {
@@ -1293,7 +1293,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 a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1301,7 +1301,7 @@ public final class Bukkit {
@@ -1320,7 +1320,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1390,7 +1390,7 @@ public final class Bukkit {
@@ -1409,7 +1409,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index a60c8bd89d14e47d3243307241458e907249a99b..194261bf20bb727d207a2429fa59abf0
public static String getMotd() {
return server.getMotd();
}
@@ -1412,7 +1412,7 @@ public final class Bukkit {
@@ -1431,7 +1431,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable