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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation
PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position
PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432)

Pufferfish Changes:
pufferfish-gg/Pufferfish@d549dda Improve vanilla parity of suffocation patch
pufferfish-gg/Pufferfish@17b3430 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@bcbaf3e Fix div by zero
This commit is contained in:
BillyGalbreath
2022-02-02 21:10:07 -06:00
parent 3f1ad9380d
commit d89923f642
13 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/api/0033-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 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102b92be020 100644
index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a84912e0f5f0b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -413,7 +413,7 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1421,7 +1421,7 @@ public final class Bukkit {
@@ -1435,7 +1435,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1471,7 +1471,7 @@ public final class Bukkit {
@@ -1485,7 +1485,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 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1498,7 +1498,7 @@ public final class Bukkit {
@@ -1512,7 +1512,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1596,7 +1596,7 @@ public final class Bukkit {
@@ -1610,7 +1610,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static String getMotd() {
return server.getMotd();
}
@@ -1618,7 +1618,7 @@ public final class Bukkit {
@@ -1632,7 +1632,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,7 +72,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290 100644
index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5a123a551 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -325,7 +325,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1190,7 +1190,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1202,7 +1202,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1234,7 +1234,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1246,7 +1246,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 d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1257,7 +1257,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1269,7 +1269,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 d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
Merchant createMerchant(@Nullable String title);
/**
@@ -1337,7 +1337,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1349,7 +1349,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
String getMotd();
// Paper start
@@ -1355,7 +1355,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1367,7 +1367,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable