Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2eca2a2 Add Player#sendEquipmentChange(Map) API (#8800)
PaperMC/Paper@b082d89 Win Screen API (#8802)
PaperMC/Paper@b1b19b6 [ci skip] Fix PiglinBarterEvent JavaDoc (#8795)
This commit is contained in:
granny
2023-01-23 00:15:17 -08:00
parent 1dcc7bf149
commit cac8a9b5a8
45 changed files with 43 additions and 92 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 de960716478477ce199526b8f860cfafa1541ee9..4d6933038e95f4479a920f3a68db0943c5b1e6a1 100644
index c68df5e5cc63b26da8623cf27e257ef07a61897d..ee238e894b10bf089fa3be496a81bcb647aa8100 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2920,4 +2920,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2946,4 +2946,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 4d6933038e95f4479a920f3a68db0943c5b1e6a1..910689c6c76c13660dc1539b0c5384d0c69615f2 100644
index ee238e894b10bf089fa3be496a81bcb647aa8100..0416b3de7a2e439891aa7b8c2c7536d7f4096026 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2928,5 +2928,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2954,5 +2954,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 910689c6c76c13660dc1539b0c5384d0c69615f2..75ecd5d492ef443a7dc25205ba0796eea34e4ba7 100644
index 0416b3de7a2e439891aa7b8c2c7536d7f4096026..2ab176269dea6035fd778640430f4f0fd499dd3b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2947,5 +2947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2973,5 +2973,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 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 75ecd5d492ef443a7dc25205ba0796eea34e4ba7..9246df99c4247e361eaa27ea266981b7fec0c14b 100644
index 2ab176269dea6035fd778640430f4f0fd499dd3b..b4b4d49de4edd13d9e0f24b8042ce6103e5b0466 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2968,5 +2968,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2994,5 +2994,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 0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad..f65a860d09d9f1d5045b2af63a80109e7c1c4ddf 100644
index b4b4d49de4edd13d9e0f24b8042ce6103e5b0466..b50a378f6de813a51ea57fced46d1df8eca6609a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3046,5 +3046,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3064,5 +3064,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

View File

@@ -1,25 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 26 Aug 2022 21:45:01 -0700
Subject: [PATCH] add Player#showCreditScreen
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9246df99c4247e361eaa27ea266981b7fec0c14b..0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2428,6 +2428,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void showDemoScreen();
+ /**
+ * Shows the credits to the player, this screen is normally only seen after
+ * going into the end portal for the first time.
+ * <br>
+ * Servers can modify the text on this screen using a resource pack.
+ */
+ public void showCreditScreen();
+
/**
* Gets whether the player has the "Allow Server Listings" setting enabled.
*