2022-11-20 18:53:58 +00:00
|
|
|
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
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* 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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 21:28:00 +00:00
|
|
|
index ada7cfe2070eae77591b3138b88d389fbaab281a..8a862dbf093ca0812aa1ce8def1e650380c303d0 100644
|
2022-11-20 18:53:58 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* 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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 21:28:00 +00:00
|
|
|
@@ -3480,6 +3480,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2022-11-20 18:53:58 +00:00
|
|
|
* @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
|