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:
5d779a621 Implements PlayerHandshakeEvent#getOriginalSocketAddressHostname and deprecates PlayerHandshakeEvent(String, boolean) in favour of PlayerHandshakeEvent(String, String, boolean)
6fab1ee3a Expose Tracked Players
b53a650a5 Clear SyncLoadInfo
c02c22fde fix: legacy component serialisation was wiped out
2dd5dccf0 Add config option for displayname in quit message (#5260)
This commit is contained in:
jmp
2021-02-27 16:51:36 -08:00
parent 529c260911
commit a5fa03865d
27 changed files with 44 additions and 53 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 5fe48dcc5a3ea492915350cff44d5f112ce11dbf..e1367ce82aad7e72863538d2de4da4b61f22fad1 100644
index b391c720b69714cf49f8733cf4440864ac3dcd72..a8883d6aa1f2cc8cf5fbdfa062bb7dc57b9b3d97 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2116,4 +2116,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2125,4 +2125,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 e1367ce82aad7e72863538d2de4da4b61f22fad1..05a7ace1a61ff162a4df26bb617663d698303b4b 100644
index a8883d6aa1f2cc8cf5fbdfa062bb7dc57b9b3d97..40169da424f35ab815149842d52e7c58c0e1dc3f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2136,5 +2136,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2145,5 +2145,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 05a7ace1a61ff162a4df26bb617663d698303b4b..e43e4a1ae3ddb8035a36c139603a8eec65b1b7f9 100644
index 40169da424f35ab815149842d52e7c58c0e1dc3f..db626ec13f520f4e731de976ef6248c21d23bec1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1946,6 +1946,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1947,6 +1947,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -944,7 +944,7 @@ index 05a7ace1a61ff162a4df26bb617663d698303b4b..e43e4a1ae3ddb8035a36c139603a8eec
* @return the client option value of the player
*/
@NotNull
@@ -1977,6 +1979,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1986,6 +1988,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start