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)

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

Paper Changes:
PaperMC/Paper@84b5d4a Reorder bukkit damage source entity for explosion (#8553)
PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429)
PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574)
PaperMC/Paper@669fed4 Fix MC-179072 (#8421)
PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554)
PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575)
PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581)
PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561)
PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573)
PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578)
PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470)
PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)
This commit is contained in:
Ben Kerllenevich
2022-11-21 23:26:26 -05:00
parent 79accf69dc
commit 8da783d679
23 changed files with 96 additions and 96 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 ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51..6355c9390238775b324b9f4e6795e40495ad3529 100644
index 1e27b9de47f111b9c000243214e22890e323f7fc..5360b67d63a732e3412ae8cb0dc7631b0bed58f1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2850,4 +2850,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2903,4 +2903,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 6355c9390238775b324b9f4e6795e40495ad3529..a0a108154d64a9ffd89b7ccfb692235a81637dd4 100644
index 5360b67d63a732e3412ae8cb0dc7631b0bed58f1..edc09706c8a79d2e91440e164fc1ceb6c85d15d3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2858,5 +2858,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2911,5 +2911,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 a0a108154d64a9ffd89b7ccfb692235a81637dd4..b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9 100644
index edc09706c8a79d2e91440e164fc1ceb6c85d15d3..7f499e420074d7550a50e832c0b11b205012e74b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2877,5 +2877,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2930,5 +2930,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0035-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 b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9..8d1bdf02266799c9ca33ec72a6c063856916e3fc 100644
index 7f499e420074d7550a50e832c0b11b205012e74b..d56f4f177919a501a5fa4ba544ea6500694cf9d2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2898,5 +2898,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2951,5 +2951,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0050-Debug-Marker-API.patch
View File

@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8d1bdf02266799c9ca33ec72a6c063856916e3fc..d2e749b08ab660ffc8ed50e4243cdb4da3447611 100644
index d56f4f177919a501a5fa4ba544ea6500694cf9d2..36eaa0c8d63eaf7f4c5ff40155b109f064f21553 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2912,5 +2912,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2965,5 +2965,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if fall damage is enabled when {@link #getAllowFlight()} is true
*/
public boolean hasFlyingFallDamage();

4
patches/api/0052-Add-death-screen-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 876eb0540f328073d8e44e9f75089d945f0a523d..9c2dcca0b6e34a3083226360575f0956a077d767 100644
index caf710fbfa91c2e2bba51ad395cf14cec91feb21..93e18658bb7a83a35f812811c2c87630a4b7eb0b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2990,5 +2990,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3043,5 +3043,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();