Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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:
63fe5e4b7 Fix further issues with rgb text pattern matching
89be8185d Don't grab the threads stacktrace when dumping same thread
ca4c781d8 [Auto] Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2021-02-25 13:16:23 -08:00
parent d3c8fb27f3
commit 831b8d70df
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7cf7e7c32c7504583c991d3ea89ef3bad7093588..932f853a00b6005cc07ad4c445f02a3478eef484 100644
index 5fe48dcc5a3ea492915350cff44d5f112ce11dbf..e1367ce82aad7e72863538d2de4da4b61f22fad1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2105,4 +2105,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2116,4 +2116,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0016-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 932f853a00b6005cc07ad4c445f02a3478eef484..4cf1317ea5a74d4a29120009bbd68078fe165fb4 100644
index e1367ce82aad7e72863538d2de4da4b61f22fad1..05a7ace1a61ff162a4df26bb617663d698303b4b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2125,5 +2125,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2136,5 +2136,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

6
patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -932,10 +932,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 4cf1317ea5a74d4a29120009bbd68078fe165fb4..dec8f865c346463bc0b50359aa0dc062fe2585da 100644
index 05a7ace1a61ff162a4df26bb617663d698303b4b..e43e4a1ae3ddb8035a36c139603a8eec65b1b7f9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1935,6 +1935,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1946,6 +1946,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -944,7 +944,7 @@ index 4cf1317ea5a74d4a29120009bbd68078fe165fb4..dec8f865c346463bc0b50359aa0dc062
* @return the client option value of the player
*/
@NotNull
@@ -1966,6 +1968,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1977,6 +1979,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start