Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b1334b5 Mark Player.sendSignChange as deprecated (#9382)
PaperMC/Paper@2f8d9db Pathfinder hasPath should check if path is done. (#9231)
PaperMC/Paper@46a36d3 Make ExperienceOrb entities call EntitySpawnEvent (#9197)
PaperMC/Paper@24d690f Fix hopper not marking source inv as changed (#9070)
PaperMC/Paper@383f0ed Remove sign ticking (#9478)
PaperMC/Paper@d8b8f61 Configurable Region Compression Format (#8505)
PaperMC/Paper@2c54b39 Don't support hex in book title and author (#9493)
PaperMC/Paper@e19177a Rewrote Amethyst logic to throw both BlockGrowEvent and BlockSpreadEvent (#9217)
PaperMC/Paper@4283054 Add player whitelist events (#9209)
PaperMC/Paper@aa93dcf feat: add minimessage tag resolvers overload to CommandSender#sendMessage (#9505)
This commit is contained in:
granny
2023-07-22 23:26:58 -07:00
parent 8fec60c7bc
commit 7cefa0cafa
8 changed files with 19 additions and 19 deletions

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 d0297f47f18cabf857cf4ce04c529b46525c0f75..f71e4cc7509db77de9656485cf3f1368ea8ce45b 100644
index 4f710a941954a3d94acabe2a83bee050ad1ff052..864dbde8e9810dcd39abafdced3fc40bc2dfd589 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3153,4 +3153,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3175,4 +3175,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

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 f71e4cc7509db77de9656485cf3f1368ea8ce45b..a38673326d7732e4067dc6aa1af4d0bf2901e843 100644
index 864dbde8e9810dcd39abafdced3fc40bc2dfd589..4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3161,5 +3161,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3183,5 +3183,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

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 a38673326d7732e4067dc6aa1af4d0bf2901e843..79d996d9347d4c837401352fda9b7ac673e29b0f 100644
index 4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22..143add524c7f3bca66a36522031ab56ce6ad714b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3180,5 +3180,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3202,5 +3202,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

View File

@@ -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 79d996d9347d4c837401352fda9b7ac673e29b0f..1916730689e8decf16fc1328775ac985ce417256 100644
index 143add524c7f3bca66a36522031ab56ce6ad714b..389d5a30cff2ed81a114a5933dd9e6437543fb41 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3201,5 +3201,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3223,5 +3223,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

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 1916730689e8decf16fc1328775ac985ce417256..0c7b2434d7ae0314f9603e04f1bedd67f3b22b66 100644
index 389d5a30cff2ed81a114a5933dd9e6437543fb41..74a9e27b8d3147876483743e1107632e332b0571 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3271,5 +3271,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3293,5 +3293,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();