Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 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 fb8bd05a0204740ec323e9b657916de6ccbf6f90..18ba9802e2f042a2e3117ee0663ac8355e75d3f3 100644
index ec1e115879c4f6608e8ba764ed87063577ee44b0..3c96189fae0426b570a4e69ad467a6b4b5066e26 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2649,4 +2649,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2657,4 +2657,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 18ba9802e2f042a2e3117ee0663ac8355e75d3f3..8325e527710d4b577d4ff98c2aa5c4277019e329 100644
index 3c96189fae0426b570a4e69ad467a6b4b5066e26..2a23cd71d6d9c8835a3c34199a75e3e7f992d64e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2657,5 +2657,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2665,5 +2665,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 8325e527710d4b577d4ff98c2aa5c4277019e329..4e6e7795f7c797da264a08f4a68f5ff48152f177 100644
index 2a23cd71d6d9c8835a3c34199a75e3e7f992d64e..69954244ef59597f4d05964518c2147b334baee6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2676,5 +2676,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2684,5 +2684,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

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

@@ -588,7 +588,7 @@ index 14986911b4d0099ea2c91ab2196a771b7dee4c50..d1eed20ea3b27f0800a08b42b62aac40
@NotNull
public static WorldCreator ofKey(@NotNull NamespacedKey worldKey) {
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 5f35ba35f8517ec28c1b21b3007c9a20dea097a7..cc058cb90d5343fed28a68855e8f2c311b16f29e 100644
index 3e980c630452c8ea72227bc4cd92c605253cd41b..583468889ad302f9a88930691c83aa5b5f19985f 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -186,6 +186,9 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
@@ -921,10 +921,10 @@ index 9d065625be5931d970d7f34e1225fae1af960314..de3ebfa362ee4d8147bb68c7c115fdfb
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4e6e7795f7c797da264a08f4a68f5ff48152f177..629689342df0a8ae3fb3833f48a9f92aec24050a 100644
index 69954244ef59597f4d05964518c2147b334baee6..949f522266159fdcf4803fb62bcfdd979470a579 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2479,6 +2479,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2487,6 +2487,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -933,7 +933,7 @@ index 4e6e7795f7c797da264a08f4a68f5ff48152f177..629689342df0a8ae3fb3833f48a9f92a
* @return the client option value of the player
*/
@NotNull
@@ -2510,6 +2512,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2518,6 +2520,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

4
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 629689342df0a8ae3fb3833f48a9f92aec24050a..24d722079edcd1422b4f1816a219cbf7d0d028c1 100644
index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e73ad7fa1 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
@@ -281,7 +281,7 @@ index 629689342df0a8ae3fb3833f48a9f92aec24050a..24d722079edcd1422b4f1816a219cbf7
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -2205,7 +2205,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2213,7 +2213,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 24d722079edcd1422b4f1816a219cbf7d0d028c1..6a978af4a08e0f03c7d4091c5be67452d57fa8ae 100644
index 38c55785f661b85ce8ba4f8bdd2eb41e73ad7fa1..c642889243590e76a953182db4e04208dcefce3e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2702,5 +2702,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2710,5 +2710,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);