geforkt von Mirrors/Paper
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
71 Zeilen
2.5 KiB
Diff
71 Zeilen
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 ad61c664af66a15e214c5db14a5c9e172f5309ae..537ebbad48191741f666aa2a30c8584562dfcb83 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3548,6 +3548,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
|