Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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:
PaperMC/Paper@8a08b86 Custom Chat Completions API (#8212)
PaperMC/Paper@6ecdbc0 Use Worldheight for Activation Ranges (#8061)
PaperMC/Paper@532dc51 Add missing BlockFadeEvents (#8171)
This commit is contained in:
BillyGalbreath
2022-07-30 18:41:23 -05:00
parent 513f3bbedf
commit 23fe5b17f7
17 changed files with 42 additions and 42 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 3fcfe8651a9c422fa9c8ff77556477f1461424cf..5af23f20d2374ed47d32d74ca86b8919a43cfb2d 100644
index b607c229cfb1e95b17b6a0073380089ef5e1b675..a6c229744a57353a21d75cec28f94cb7436b6493 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2777,4 +2777,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2796,4 +2796,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 5af23f20d2374ed47d32d74ca86b8919a43cfb2d..d2bc1d346a276cd6aea6024898074f6b0fec3595 100644
index a6c229744a57353a21d75cec28f94cb7436b6493..0e56a15484e1ed4d75e1cf8793ce80cc9a621451 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2785,5 +2785,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2804,5 +2804,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 d2bc1d346a276cd6aea6024898074f6b0fec3595..057b5e62919f47d698a7650aedac23316ec51094 100644
index 0e56a15484e1ed4d75e1cf8793ce80cc9a621451..6e7be19da424b16b8540d28a24c1eed87aa72607 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2804,5 +2804,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2823,5 +2823,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 057b5e62919f47d698a7650aedac23316ec51094..4766ebb24bdf02a045e2e8aba18b8ae314a0e201 100644
index 6e7be19da424b16b8540d28a24c1eed87aa72607..b3dbcca5efbc315d671b8ae260824620d97e5f52 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2825,5 +2825,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2844,5 +2844,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

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

@@ -260,10 +260,10 @@ index 3d053490dc87724f57893a553f1ab9cf1a3b73c0..ec8c098ee07ac88c023ec6274788c94a
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4766ebb24bdf02a045e2e8aba18b8ae314a0e201..6a99736f059a9034cd93e84a170f80e6168ea275 100644
index b3dbcca5efbc315d671b8ae260824620d97e5f52..5e06858d68f725508e0055de3f5d8c0f6a56601b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2839,5 +2839,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2858,5 +2858,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if fall damage is enabled when {@link #getAllowFlight()} is true
*/
public boolean hasFlyingFallDamage();