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@7045f18 Change link to screamingsandals
PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792)
PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800)
PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835)
PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837)

Pufferfish Changes:
pufferfish-gg/Pufferfish@629b5b3 Updated Upstream (Paper)
This commit is contained in:
granny
2022-05-21 03:26:59 -07:00
parent 0939ddedab
commit 5f07aff44c
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -72,7 +72,7 @@ index e7bca7fc74a6a2914c966183c9f83340dd510bf0..9189ada0644a226038eeb7967d45c72d
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8b8b1f8bc 100644
index cc026cbb487244851f8f58b763655a583c7b32e5..226dd08c1001c664d60f45a6d9370077f4b8c574 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -84,7 +84,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
public int broadcastMessage(@NotNull String message);
// Paper start
@@ -976,7 +976,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -973,7 +973,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 d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1289,7 +1289,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1286,7 +1286,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1333,7 +1333,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1330,7 +1330,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 d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1356,7 +1356,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1353,7 +1353,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 d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
Merchant createMerchant(@Nullable String title);
/**
@@ -1459,7 +1459,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1456,7 +1456,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8
String getMotd();
// Paper start
@@ -1477,7 +1477,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1474,7 +1474,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable