Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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

4
patches/api/0005-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7eda2ba17e39b8183e572c1cefa8afffbf17afcb..f24ef3e3825e3535439f690e2c87757462778adb 100644
index fb8bd05a0204740ec323e9b657916de6ccbf6f90..18ba9802e2f042a2e3117ee0663ac8355e75d3f3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2628,4 +2628,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2649,4 +2649,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0010-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f24ef3e3825e3535439f690e2c87757462778adb..7335391d0b394fe3c34659cba4bc972b1d2ee2c9 100644
index 18ba9802e2f042a2e3117ee0663ac8355e75d3f3..8325e527710d4b577d4ff98c2aa5c4277019e329 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2636,5 +2636,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2657,5 +2657,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0017-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7335391d0b394fe3c34659cba4bc972b1d2ee2c9..e93dc909c2e6fbc9daf0af66dfc2a4135646b91d 100644
index 8325e527710d4b577d4ff98c2aa5c4277019e329..4e6e7795f7c797da264a08f4a68f5ff48152f177 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2655,5 +2655,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2676,5 +2676,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

10
patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -203,7 +203,7 @@ index c83672427324bd068ed52916f700b68446a226f6..d28f8f0fb6dcf34453a75af9e9efd18a
private final Class<? extends Event> eventClass;
private final MethodHandle handle;
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
index b6e7d8ee8d903ebf975d60bec0e08603d9a49fdb..55770ba8a2461c782f311aeb8abc79ec5f53ea81 100644
index b8d5c13980858dc27fb5383726b7ebcaf14adcb8..000b8593300aca4f74987106e18915cde2b9f159 100644
--- a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -11,6 +11,9 @@ import org.objectweb.asm.commons.GeneratorAdapter;
@@ -907,7 +907,7 @@ index 6f5b6901032eb03606c4566b24459a03baac0c73..9dc1f27d3b36e112d2e79d93b3e49c39
/*
diff --git a/src/main/java/org/bukkit/entity/Panda.java b/src/main/java/org/bukkit/entity/Panda.java
index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e87b2e581f 100644
index 9d065625be5931d970d7f34e1225fae1af960314..de3ebfa362ee4d8147bb68c7c115fdfb4eb55143 100644
--- a/src/main/java/org/bukkit/entity/Panda.java
+++ b/src/main/java/org/bukkit/entity/Panda.java
@@ -37,6 +37,9 @@ public interface Panda extends Animals {
@@ -921,10 +921,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e93dc909c2e6fbc9daf0af66dfc2a4135646b91d..e616d383a71964b9807acb2c8206057017bbf281 100644
index 4e6e7795f7c797da264a08f4a68f5ff48152f177..629689342df0a8ae3fb3833f48a9f92aec24050a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2458,6 +2458,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2479,6 +2479,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -933,7 +933,7 @@ index e93dc909c2e6fbc9daf0af66dfc2a4135646b91d..e616d383a71964b9807acb2c82060570
* @return the client option value of the player
*/
@NotNull
@@ -2489,6 +2491,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2510,6 +2512,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

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

4
patches/api/0037-Flying-Fall-Damage-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a6b18e764f7d31d72d7427487df94d1ffd97d94f..9cedce0ed0b0949155f607727918f554b72c47c9 100644
index 24d722079edcd1422b4f1816a219cbf7d0d028c1..6a978af4a08e0f03c7d4091c5be67452d57fa8ae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2681,5 +2681,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2702,5 +2702,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);