Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00: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:
a0093e142 Adventure 4.5.1
afea0e8ab Add links to the Adventure javadocs
846783c8a Fix a couple of typos in the javadoc for Player (#5235)
a2574d8f5 Replace usages of LegacyComponentSerializer.legacySection() in Paper-Server with PaperAdventure.LEGACY_SECTION_UXRC (#5233)
This commit is contained in:
jmp
2021-02-23 12:37:39 -08:00
parent 18f97a99e2
commit 4602b9b2fc
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -8,7 +8,7 @@ Tuinity config
API to retrieve raw YamlConfiguration + timing exports
diff --git a/pom.xml b/pom.xml
index 0d922ea17c675d6e3a7106937918d2a818814fba..6c88a9d9f2292e1e65bd631aedbe15e0430d3af4 100644
index af17cd24b44c601f300e3ad5d6c57d810768b5e8..d12192dcdf733c28661a338b1b969fea2356dfd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@

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 2e78c50de2f01d667a534bfb60ea93209b7f8f8e..5884cd31988c6eab3b56e857db09c96ff54d634c 100644
index a782286c381907dad341ab4985eb774291f5520f..1679c292d17959740852fc2188c2f21a02bd831e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2106,4 +2106,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2105,4 +2105,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 5884cd31988c6eab3b56e857db09c96ff54d634c..d9ea837004d7e8643f93ad241a6dad3192e0afce 100644
index 1679c292d17959740852fc2188c2f21a02bd831e..91b48898005976e9cf2e8b0bec8e03bc70d16f00 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2126,5 +2126,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2125,5 +2125,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 d9ea837004d7e8643f93ad241a6dad3192e0afce..86629a708963463badc4ab4796ea1221e8768e8a 100644
index 91b48898005976e9cf2e8b0bec8e03bc70d16f00..3f6fb8e862f8c7591262d4a6e1e3a95ee18b8f72 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1936,6 +1936,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1935,6 +1935,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -944,7 +944,7 @@ index d9ea837004d7e8643f93ad241a6dad3192e0afce..86629a708963463badc4ab4796ea1221
* @return the client option value of the player
*/
@NotNull
@@ -1967,6 +1969,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1966,6 +1968,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start