mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3c41f8f Cache map ids on item frames (#9584) PaperMC/Paper@3b4839e Fix players are invisible after using setPlayerProfile (#9143) PaperMC/Paper@20a71c5 Add restrict-player-reloot-time config (#7652) PaperMC/Paper@29aaf7b Fix custom statistic criteria creation (#9595) PaperMC/Paper@2df309b Bandaid fix for Effect (#9548) PaperMC/Paper@1dfdbef SculkCatalyst bloom API (#9466) PaperMC/Paper@02338e5 Fix DEFAULT getEntitySpawnReason for /summon (#9480) PaperMC/Paper@23c44c2 [ci skip] Update README
This commit is contained in:
@@ -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 14c92390aeaeee518f43778ccd5fc820fdc62689..34f3fed298840b4e1bf8ec787999bdd1d7cc1d82 100644
|
||||
index e3a6c9fc63b36663d33c6a1513e7dc1522790d85..62075eed2bdcd1611414fa969832d9706a1b186e 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3241,4 +3241,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -3245,4 +3245,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@Override
|
||||
Spigot spigot();
|
||||
// Spigot end
|
||||
|
||||
@@ -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 34f3fed298840b4e1bf8ec787999bdd1d7cc1d82..e595d8f4858c70e6ad1a9cbcd4c48276a9652036 100644
|
||||
index 62075eed2bdcd1611414fa969832d9706a1b186e..42624ec551509e565f6c0c0b4cc5b4c7ba1f1575 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3249,5 +3249,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -3253,5 +3253,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @return True if Player uses Purpur Client
|
||||
*/
|
||||
public boolean usesPurpurClient();
|
||||
|
||||
@@ -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 e595d8f4858c70e6ad1a9cbcd4c48276a9652036..c5ed6ced17316c0af396520f7f1fa25bdc1a944d 100644
|
||||
index 42624ec551509e565f6c0c0b4cc5b4c7ba1f1575..43448b96b5261e11bfb284e1efe726eb3e9cbeee 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3268,5 +3268,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -3272,5 +3272,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* Reset the idle timer back to 0
|
||||
*/
|
||||
void resetIdleTimer();
|
||||
|
||||
@@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd
|
||||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index c5ed6ced17316c0af396520f7f1fa25bdc1a944d..3e826f0be104d98c2676b429a5a9b66ca437f681 100644
|
||||
index 43448b96b5261e11bfb284e1efe726eb3e9cbeee..d48ec786ed86bdffdf7fe0320967e11b7af78bd5 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3289,5 +3289,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -3293,5 +3293,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* @param invulnerableTicks Invulnerable ticks remaining
|
||||
*/
|
||||
void setSpawnInvulnerableTicks(int invulnerableTicks);
|
||||
|
||||
@@ -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 3e826f0be104d98c2676b429a5a9b66ca437f681..fb99e05b4769af604f41d81f036cee3b8a6ec197 100644
|
||||
index d48ec786ed86bdffdf7fe0320967e11b7af78bd5..2e41fad4c033de003f89ab4ab549d2bf47ad7d4f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3359,5 +3359,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -3363,5 +3363,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* Clears all debug block highlights
|
||||
*/
|
||||
void clearBlockHighlights();
|
||||
|
||||
Reference in New Issue
Block a user