Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@afa16e6 Modify offline mode warning to include Velocity line (#8812)
PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816)
PaperMC/Paper@7e7e6b4 More Win Screen API (#8805)
PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713)
PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843)
PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842)
PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)
This commit is contained in:
granny
2023-02-13 15:48:05 -08:00
parent 0090323edb
commit 08aa4dccaa
19 changed files with 54 additions and 73 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 b0bd8194d263f6986e80b7d9848297a2bf27a112..ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8 100644
index d7d94b954262da0cbe11850cbc3ebd45e32c8c76..f4586e7326f4a146778cdc61fb087b8d5c141ab0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2971,4 +2971,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3000,4 +3000,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 ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8..f4d31bd1301e7e38f46be6b93c6021169c8eca75 100644
index f4586e7326f4a146778cdc61fb087b8d5c141ab0..0226881e26431dded883557f003c2d3a5ced349b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2979,5 +2979,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3008,5 +3008,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 f4d31bd1301e7e38f46be6b93c6021169c8eca75..b269df50f3913d40646cfc597d78851ed0c0acb4 100644
index 0226881e26431dded883557f003c2d3a5ced349b..9bbb58d173ab3e0c586273e9135c40184cb5e127 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2998,5 +2998,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3027,5 +3027,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0019-ItemStack-convenience-methods.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index e5b94299793ba7cb9071a3f3a35ddbe08b0b9906..0a3013843f7e1d3fcedfaca6a7b288642ebcb407 100644
index ee471fbd7c2138cd330b2c64da4e77b3414ec913..4df3de56641b0ce028f25ee8d3ed496c707302a7 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -10688,4 +10688,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -10714,4 +10714,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getCreativeCategory(this);
}

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

@@ -260,10 +260,10 @@ index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e0410
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b269df50f3913d40646cfc597d78851ed0c0acb4..b51589a741ee529113c42529df1d3551afd606ef 100644
index 9bbb58d173ab3e0c586273e9135c40184cb5e127..9464ec6b436b79f015f50279aed2ed38e32d5909 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3019,5 +3019,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3048,5 +3048,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0050-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 b51589a741ee529113c42529df1d3551afd606ef..46dd9980b4ef09153c1ad9cbf447e7089ecfa6ac 100644
index 9464ec6b436b79f015f50279aed2ed38e32d5909..d5ad02c1fa2b840289d316400952aaebb8c5dad1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3089,5 +3089,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3118,5 +3118,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();