Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 f05edac8cdd33daaf1d15a526be4d2ac2b08846d..8776b8368d2046dee02e927de8249030bdddf2ee 100644
index 024da3febe3fd6c54aa30e99cb08300bc38ddb92..2002423121ed73faf6b06ccb1f19152980d1ea21 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1626,6 +1626,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1677,6 +1677,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 8482c4a664a02614fd59f74a4f9dd6d2e32003f5..f5c48ce541876a623445e1a99fc55f101c2b3fc8 100644
index 2002423121ed73faf6b06ccb1f19152980d1ea21..0e37bb7ed1bf1855a5d19519f34018ae8b6a0d95 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1634,6 +1634,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1685,6 +1685,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 001d6e4f6d9d91c6929ae84c53dbd23c6c8112c9..93daff9e8a75c2019a907577841f6eeddaabb5e1 100644
index 88b33dbd6a2b67e9665e0c24b986cf30acb1a5fa..ef3068c0bf8e834c85e2719fe08c406790523161 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2006,4 +2006,15 @@ public final class Bukkit {
@@ -2061,4 +2061,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 001d6e4f6d9d91c6929ae84c53dbd23c6c8112c9..93daff9e8a75c2019a907577841f6eed
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f5c48ce541876a623445e1a99fc55f101c2b3fc8..f8ee62ed450f52bc3a321ff75a36b9778f0f91b5 100644
index 0e37bb7ed1bf1855a5d19519f34018ae8b6a0d95..70bbd5b7586a35e70b09edfcd2d47bb54757bf9a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1756,4 +1756,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1807,4 +1807,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 93daff9e8a75c2019a907577841f6eeddaabb5e1..bf86f402bc099ee190c809220f211ed59b3e9613 100644
index ef3068c0bf8e834c85e2719fe08c406790523161..4a7e1521711c4e4728662cd6200d6d9d6b600713 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2016,5 +2016,14 @@ public final class Bukkit {
@@ -2071,5 +2071,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 93daff9e8a75c2019a907577841f6eeddaabb5e1..bf86f402bc099ee190c809220f211ed5
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f8ee62ed450f52bc3a321ff75a36b9778f0f91b5..bab0c0d660a01e912d0a88aefbacf20895f4ef61 100644
index 70bbd5b7586a35e70b09edfcd2d47bb54757bf9a..9b316559dba0b1df674d68bdd51d3497dcd25d61 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1764,5 +1764,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1815,5 +1815,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

12
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 59734f9d2a2aa59f683b8fae5b6c19e61c2bc40d..5ca1d420a14797d8b2a867f867d19188084e7fa5 100644
index 9b316559dba0b1df674d68bdd51d3497dcd25d61..988b1c6c819cac350cde581e486e98d886227c4e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1599,6 +1599,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1650,6 +1650,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
UnsafeValues getUnsafe();
// Spigot start
@@ -696,7 +696,7 @@ index 70274f2e2a1d6f27c4febd9d5d5fa3ee1b49f100..3b98e6e3e6dea0df5fb9462c78e8c142
/**
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index fb0e608fa92dae99b9eee8fc1cbdf4b91a33e620..ca6d3afd6fa51c0822e289356025b51bc50f55a7 100644
index 096dca3b733688dcc17669d78efbc5115f9b6e4a..63fbe3197918aaeab49d0397d2873dc91e3204e7 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -62,6 +62,9 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
@@ -908,7 +908,7 @@ index d616d5941b3c7b85e350e845901da798601b9a3c..14bdddb7ced9c4cd92a8ad96d97a08a6
/**
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
index 4da9f3c5f1423bf8f9eeb490736cabf027853e60..082e90859e6c965029606d7d395673a81bff2cb4 100644
index 812af884d0601645e254ac29613323d2fd92a112..c1b1ac9210eaaa02dad0449aac867efbd1cac36a 100644
--- a/src/main/java/org/bukkit/entity/Guardian.java
+++ b/src/main/java/org/bukkit/entity/Guardian.java
@@ -1,5 +1,8 @@
@@ -1123,7 +1123,7 @@ index 25d26e3fe713311e66d7e634a6c32af61f4cef59..2825263c102d3f9ed37f6884e09ec5ef
/**
diff --git a/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java b/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
index 668cc4b7d8a15ae345d130f8164107f000b6fe22..ebfeb3c8ebaf53a7fb6349f0f1480efc34c971e9 100644
index 891f3d250b8ea2af0902602758efb1e27183d558..5cc86332986ce4c70e6c1a95a51601b9a29f95b3 100644
--- a/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
+++ b/src/main/java/org/bukkit/event/block/CauldronLevelChangeEvent.java
@@ -12,6 +12,9 @@ import org.bukkit.event.HandlerList;
@@ -1287,7 +1287,7 @@ index 9e852ac973d7a38c075249360be483ed0e5f5ac6..55db1a074144c709489d7f6a4e353b8f
/**
diff --git a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
index 418f9391d86fff0d0a75da0574edccbb29aa9931..921d964d7e40e7710b5a5db18bd9329ca40c1ece 100644
index c98f07f82d179dffe162bb5cd85efe97de1b6175..a03669ed9720a9a8ed646bcaebbd8edc6f51cfce 100644
--- a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
+++ b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
@@ -67,6 +67,9 @@ public class LightningStrikeEvent extends WeatherEvent implements Cancellable {

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

@@ -5,7 +5,7 @@ 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 cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f700ac2c01e 100644
index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f5d60f0eb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -346,7 +346,7 @@ public final class Bukkit {
@@ -17,7 +17,7 @@ index cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -990,7 +990,7 @@ public final class Bukkit {
@@ -1045,7 +1045,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 cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1267,7 +1267,7 @@ public final class Bukkit {
@@ -1322,7 +1322,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1317,7 +1317,7 @@ public final class Bukkit {
@@ -1372,7 +1372,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 cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1344,7 +1344,7 @@ public final class Bukkit {
@@ -1399,7 +1399,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1433,7 +1433,7 @@ public final class Bukkit {
@@ -1488,7 +1488,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
public static String getMotd() {
return server.getMotd();
}
@@ -1455,7 +1455,7 @@ public final class Bukkit {
@@ -1510,7 +1510,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,7 +72,7 @@ index cc739092191c0d1736b1b25622104d23ab171ce8..c6b3bf5b16c26f652c0649c7a2c41f70
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97fd1e82590 100644
index 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a453ba400 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -270,7 +270,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -84,7 +84,7 @@ index 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
public int broadcastMessage(@NotNull String message);
// Paper start
@@ -793,7 +793,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -844,7 +844,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 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1055,7 +1055,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1106,7 +1106,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1099,7 +1099,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1150,7 +1150,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 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1122,7 +1122,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1173,7 +1173,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 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
Merchant createMerchant(@Nullable String title);
/**
@@ -1195,7 +1195,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1246,7 +1246,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index 5ca1d420a14797d8b2a867f867d19188084e7fa5..f82023103a328f234c990d6787c9b97f
String getMotd();
// Paper start
@@ -1213,7 +1213,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1264,7 +1264,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bc03bbf9fa61b98bc6c208ab4a0e653f4b0ea472..5bb39f78a7e87dddc38b1a641438ebcc2de945b7 100644
index da1ebc0bddee0b3f53ec0f7a46f7ce1c517c329c..01e3372e67de500b46544bc83a6ba929424e5fda 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM