mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 08:28:01 +02:00
fe53b0e76f
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1d522878 PR-966: Introduce getRespawnLocation as a replacement for getBedSpawnLocation cc01b745 PR-965: Add DragonBattle#setPreviouslyKilled 28e3702f SPIGOT-6921, PR-957: Add methods to remove all enchantments on an ItemStack 8872404e PR-961: Add BlockData#copyTo 4054cc7b PR-956: Add method to get an offline player's location CraftBukkit Changes: 292ec79e0 SPIGOT-7568: Call EntityChangeBlockEvent for DecoratedPot b44bf5aa8 SPIGOT-7575: SuspiciousStewMeta creates invalid PotionEffect data 161784713 PR-1340: Centralize the conversion from and to Minecraft / Bukkit registry items even more and add a test case for them b93c5a30d PR-1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation fb973486c SPIGOT-7570: PrepareItemCraftEvent#isRepair() always returns false c9c24535e PR-1337: Add DragonBattle#setPreviouslyKilled c8b4da803 SPIGOT-6921, PR-1330: Add methods to remove all enchantments on an ItemStack 95bc1c4f5 PR-1333: Add BlockData#copyTo 36e2f9ce1 PR-1329: Add method to get an offline player's location Spigot Changes: c198da22 SPIGOT-7563: Update to latest release of bungeecord-chat
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: dawon <dawon@dawon.eu>
|
|
Date: Sat, 15 Oct 2022 00:46:32 +0200
|
|
Subject: [PATCH] Add Player Warden Warning API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 73536de601692a75fc83ff8b6e6781c7ae320a02..7a680e61038856743d1271bae9b3ce8b8230a40f 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3412,6 +3412,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* @param silent whether sound should be silenced
|
|
*/
|
|
void showElderGuardian(boolean silent);
|
|
+
|
|
+ /**
|
|
+ * Returns the player's cooldown in ticks until the next Warden warning can occur.
|
|
+ *
|
|
+ * @return ticks until next Warden warning can occur. 0 means there is no cooldown left.
|
|
+ */
|
|
+ int getWardenWarningCooldown();
|
|
+
|
|
+ /**
|
|
+ * Sets the player's cooldown in ticks until next Warden warning can occur.
|
|
+ *
|
|
+ * @param cooldown ticks until next Warden warning can occur. 0 means there is no cooldown left. Values less than 0 are set to 0.
|
|
+ */
|
|
+ void setWardenWarningCooldown(int cooldown);
|
|
+
|
|
+ /**
|
|
+ * Returns time since last Warden warning in ticks.
|
|
+ *
|
|
+ * @return ticks since last Warden warning
|
|
+ */
|
|
+ int getWardenTimeSinceLastWarning();
|
|
+
|
|
+ /**
|
|
+ * Sets time since last Warden warning in ticks.
|
|
+ *
|
|
+ * @param time ticks since last Warden warning
|
|
+ */
|
|
+ void setWardenTimeSinceLastWarning(int time);
|
|
+
|
|
+ /**
|
|
+ * Returns the player's current Warden warning level.
|
|
+ *
|
|
+ * @return current Warden warning level
|
|
+ */
|
|
+ int getWardenWarningLevel();
|
|
+
|
|
+ /**
|
|
+ * Sets the player's Warden warning level.
|
|
+ * <p>
|
|
+ * <b>Note:</b> This will not actually spawn the Warden.
|
|
+ * Even if the warning level is over threshold, the player still needs to activate a Shrieker in order to summon the Warden.
|
|
+ *
|
|
+ * @param warningLevel player's Warden warning level. The warning level is internally limited to valid values.
|
|
+ */
|
|
+ void setWardenWarningLevel(int warningLevel);
|
|
+
|
|
+ /**
|
|
+ * Increases the player's Warden warning level if possible and not on cooldown.
|
|
+ * <p>
|
|
+ * <b>Note:</b> This will not actually spawn the Warden.
|
|
+ * Even if the warning level is over threshold, the player still needs to activate a Shrieker in order to summon the Warden.
|
|
+ */
|
|
+ void increaseWardenWarningLevel();
|
|
// Paper end
|
|
|
|
@NotNull
|