Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 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 a23c08c48ec627147d94ab4bf4fdf4dae1edeaca..bf4699c405447d07e9a4b70522c7a7c944677f74 100644
index f7fd13dc6056817819c1dbffcaf19c25b95fe2c0..250b434af848546fa3a6ffd748f03a910095b33d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1925,4 +1925,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1933,4 +1933,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0018-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 bf4699c405447d07e9a4b70522c7a7c944677f74..18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8 100644
index 250b434af848546fa3a6ffd748f03a910095b33d..e398da35bef48b5846d8c66df75b1df11b43e382 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1945,5 +1945,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1953,5 +1953,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

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

@@ -1015,7 +1015,7 @@ 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 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef4240d691fa 100644
index e398da35bef48b5846d8c66df75b1df11b43e382..8da3ce6d1ba6911cb1a4be2e425266bd4760c052 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1433,7 +1433,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1066,7 +1066,7 @@ index 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef42
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -1774,6 +1768,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1782,6 +1776,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -1075,7 +1075,7 @@ index 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef42
* @return the client option value of the player
*/
@NotNull
@@ -1794,6 +1790,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1802,6 +1798,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start