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)

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

Paper Changes:
PaperMC/Paper@2a306f5 Add Multi Block Change API (#7333)
PaperMC/Paper@feb72b8 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317)
This commit is contained in:
BillyGalbreath
2022-01-20 17:45:15 -06:00
parent 43657416e9
commit 762fcddb3e
15 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -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 e616d383a71964b9807acb2c8206057017bbf281..a6b18e764f7d31d72d7427487df94d1ffd97d94f 100644
index 629689342df0a8ae3fb3833f48a9f92aec24050a..24d722079edcd1422b4f1816a219cbf7d0d028c1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -76,7 +76,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -263,7 +263,7 @@ index e616d383a71964b9807acb2c8206057017bbf281..a6b18e764f7d31d72d7427487df94d1f
public void kickPlayer(@Nullable String message);
// Paper start
@@ -695,7 +695,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -716,7 +716,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)}
*/
@@ -272,7 +272,7 @@ index e616d383a71964b9807acb2c8206057017bbf281..a6b18e764f7d31d72d7427487df94d1f
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
@@ -716,7 +716,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -737,7 +737,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 e616d383a71964b9807acb2c8206057017bbf281..a6b18e764f7d31d72d7427487df94d1f
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -2184,7 +2184,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2205,7 +2205,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #locale()}
*/
@NotNull