mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 20:07:41 +01:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
154 lines
4.8 KiB
Diff
154 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 24 Jun 2020 15:12:18 -0600
|
|
Subject: [PATCH] Added PlayerChangeBeaconEffectEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..7646050f4bfc9092afaae9f769b0f7ecb42262ff
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerChangeBeaconEffectEvent.java
|
|
@@ -0,0 +1,141 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.potion.PotionEffectType;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when a player sets the effect for a beacon
|
|
+ */
|
|
+public class PlayerChangeBeaconEffectEvent extends PlayerEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ private PotionEffectType primary;
|
|
+ private PotionEffectType secondary;
|
|
+ private final Block beacon;
|
|
+ private boolean consumeItem = true;
|
|
+
|
|
+ private boolean isCancelled;
|
|
+
|
|
+ public PlayerChangeBeaconEffectEvent(@NotNull Player player, @Nullable PotionEffectType primary, @Nullable PotionEffectType secondary, @Nullable Block beacon) {
|
|
+ super(player);
|
|
+ this.primary = primary;
|
|
+ this.secondary = secondary;
|
|
+ this.isCancelled = false;
|
|
+ this.beacon = beacon;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the primary effect
|
|
+ */
|
|
+ @Nullable public PotionEffectType getPrimary() {
|
|
+ return primary;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the primary effect
|
|
+ * <p>
|
|
+ * NOTE: The primary effect still has to be one of the valid effects for a beacon.
|
|
+ *
|
|
+ * @param primary the primary effect
|
|
+ */
|
|
+ public void setPrimary(@Nullable PotionEffectType primary) {
|
|
+ this.primary = primary;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the secondary effect
|
|
+ */
|
|
+ @Nullable public PotionEffectType getSecondary() {
|
|
+ return secondary;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the secondary effect
|
|
+ * <p>
|
|
+ * This only has an effect when the beacon is able to accept a secondary effect.
|
|
+ * NOTE: The secondary effect still has to be a valid effect for a beacon.
|
|
+ *
|
|
+ * @param secondary the secondary effect
|
|
+ */
|
|
+ public void setSecondary(@Nullable PotionEffectType secondary) {
|
|
+ this.secondary = secondary;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return the beacon block associated with this event, or null if not found
|
|
+ */
|
|
+ @Nullable
|
|
+ public Block getBeacon() {
|
|
+ return beacon;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets if the item used to change the beacon will be consumed.
|
|
+ * <p>
|
|
+ * Independent of {@link #isCancelled()}. If the event is cancelled
|
|
+ * the item will <b>NOT</b> be consumed.
|
|
+ *
|
|
+ * @return true if item will be consumed
|
|
+ */
|
|
+ public boolean willConsumeItem() {
|
|
+ return consumeItem;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets if the item used to change the beacon should be consumed.
|
|
+ * <p>
|
|
+ * Independent of {@link #isCancelled()}. If the event is cancelled
|
|
+ * the item will <b>NOT</b> be consumed.
|
|
+ *
|
|
+ * @param consumeItem true if item should be consumed
|
|
+ */
|
|
+ public void setConsumeItem(boolean consumeItem) {
|
|
+ this.consumeItem = consumeItem;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins
|
|
+ * <p>
|
|
+ * If a {@link PlayerChangeBeaconEffectEvent} is cancelled, the changes will
|
|
+ * not take effect
|
|
+ *
|
|
+ * @return true if this event is cancelled
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.isCancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins
|
|
+ * <p>
|
|
+ * If cancelled, the item will <b>NOT</b> be consumed regardless of what {@link #willConsumeItem()} says
|
|
+ * <p>
|
|
+ * If a {@link PlayerChangeBeaconEffectEvent} is cancelled, the changes will not be applied
|
|
+ * or saved.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.isCancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|