mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
101 lines
2.6 KiB
Diff
101 lines
2.6 KiB
Diff
From 187c890c4b97f0664edd8959a7dd28e30ad611d4 Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Mon, 29 Feb 2016 18:09:40 -0600
|
|
Subject: [PATCH] Add BeaconEffectEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
|
|
new file mode 100644
|
|
index 000000000..978813b94
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
|
|
@@ -0,0 +1,86 @@
|
|
+package com.destroystokyo.paper.event.block;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.bukkit.potion.PotionEffect;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a beacon effect is being applied to a player.
|
|
+ */
|
|
+public class BeaconEffectEvent extends BlockEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private PotionEffect effect;
|
|
+ private Player player;
|
|
+ private boolean primary;
|
|
+
|
|
+ public BeaconEffectEvent(@NotNull Block block, @NotNull PotionEffect effect, @NotNull Player player, boolean primary) {
|
|
+ super(block);
|
|
+ this.effect = effect;
|
|
+ this.player = player;
|
|
+ this.primary = primary;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancelled) {
|
|
+ this.cancelled = cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the potion effect being applied.
|
|
+ *
|
|
+ * @return Potion effect
|
|
+ */
|
|
+ @NotNull
|
|
+ public PotionEffect getEffect() {
|
|
+ return effect;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the potion effect that will be applied.
|
|
+ *
|
|
+ * @param effect Potion effect
|
|
+ */
|
|
+ public void setEffect(@NotNull PotionEffect effect) {
|
|
+ this.effect = effect;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the player who the potion effect is being applied to.
|
|
+ *
|
|
+ * @return Affected player
|
|
+ */
|
|
+ @NotNull
|
|
+ public Player getPlayer() {
|
|
+ return player;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets whether the effect is a primary beacon effect.
|
|
+ *
|
|
+ * @return true if this event represents a primary effect
|
|
+ */
|
|
+ public boolean isPrimary() {
|
|
+ return primary;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|