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 & Tuinity)

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

Paper Changes:
415f7ca165 Updated Upstream (Bukkit/CraftBukkit)
37df95b189 refactor: do not import List; use FQN
5c65546f5c rebase
fdef125b19 Expose EntityType#getTranslationKey
4d9b14efa4 Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381)
8c2adf8e9e Add warning to getOfflinePlayers (#6365)
370b60de14 Optimize indirect passenger iteration (#6366)
80836709e7 Fix block drops position losing precision millions of blocks out (#6387)
e942509e73 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)
ce43ce8265 Make EntityUnleashEvent cancellable (#4993)
591cac3685 Configurable item frame map cursor interval (#6385)
e9aa9ce66b Add config migration for named entity death logging option (#6390)
c2f47a76ae Implement Translatable in appropriate places (#6248)
f12a7f57e1 Clear bucket NBT after dispense (#6391)
4dd33cb8b6 [ci skip] Drop "Fix CME on adding a passenger in CreatureSpawnEvent" (#6384)
565cd3306c [ci skip] Add some helper methods to the ObfHelper util class (#6374)

Tuinity Changes:
6fd7e2b376 Update paper
This commit is contained in:
William Blake Galbreath
2021-08-14 16:40:10 -05:00
parent 158ae61463
commit 635d108ae2
67 changed files with 276 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
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 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f5d60f0eb 100644
index 39490406f914a5082d9d4b3937d9df63c222efa6..e4ec2a0c15a6ada5bef9671e427cd56413f18d80 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 {
@@ -26,7 +26,7 @@ index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1322,7 +1322,7 @@ public final class Bukkit {
@@ -1324,7 +1324,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1372,7 +1372,7 @@ public final class Bukkit {
@@ -1374,7 +1374,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 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1399,7 +1399,7 @@ public final class Bukkit {
@@ -1401,7 +1401,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1488,7 +1488,7 @@ public final class Bukkit {
@@ -1490,7 +1490,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
public static String getMotd() {
return server.getMotd();
}
@@ -1510,7 +1510,7 @@ public final class Bukkit {
@@ -1512,7 +1512,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,7 +72,7 @@ index 4a7e1521711c4e4728662cd6200d6d9d6b600713..34902835cd4e030902feb568a2315c7f
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a453ba400 100644
index 86141c856478c6b39f7ef52f590a68e564da1ba9..80c70522eecb08c0dbfadcdeb21c9cfac42d7902 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
@@ -93,7 +93,7 @@ index 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1106,7 +1106,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1108,7 +1108,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1150,7 +1150,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1152,7 +1152,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 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1173,7 +1173,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1175,7 +1175,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 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a
Merchant createMerchant(@Nullable String title);
/**
@@ -1246,7 +1246,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1248,7 +1248,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index 988b1c6c819cac350cde581e486e98d886227c4e..061ce81a781ac1c577927972b862f48a
String getMotd();
// Paper start
@@ -1264,7 +1264,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1266,7 +1266,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 da1ebc0bddee0b3f53ec0f7a46f7ce1c517c329c..01e3372e67de500b46544bc83a6ba929424e5fda 100644
index 3fc740eca60e4d21c13f1a4495f84ec765c007c9..6c540b0c74ba6f4fe8a1ff35db24050b78775fc3 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
@@ -263,7 +263,7 @@ index da1ebc0bddee0b3f53ec0f7a46f7ce1c517c329c..01e3372e67de500b46544bc83a6ba929
public void kickPlayer(@Nullable String message);
// Paper start
@@ -625,7 +625,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -673,7 +673,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List)}
*/
@@ -271,8 +271,8 @@ index da1ebc0bddee0b3f53ec0f7a46f7ce1c517c329c..01e3372e67de500b46544bc83a6ba929
+ @Deprecated // Paper // Purpur - conflict on change
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
@@ -647,7 +647,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
@@ -694,7 +694,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List, org.bukkit.DyeColor)}
*/
@@ -281,7 +281,7 @@ index da1ebc0bddee0b3f53ec0f7a46f7ce1c517c329c..01e3372e67de500b46544bc83a6ba929
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -1796,7 +1796,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1865,7 +1865,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #locale()}
*/
@NotNull