mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 08:28:01 +02:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
100 lines
3.0 KiB
Diff
100 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
|
|
Date: Mon, 10 May 2021 16:58:38 +0100
|
|
Subject: [PATCH] Add PufferFishStateChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java b/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..4e04b49c1e2bc2a965c9be2388539d9ed5a58f89
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
|
|
@@ -0,0 +1,87 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.PufferFish;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called just before a {@link PufferFish} inflates or deflates.
|
|
+ */
|
|
+public class PufferFishStateChangeEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final int newPuffState;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PufferFishStateChangeEvent(@NotNull PufferFish entity, int newPuffState) {
|
|
+ super(entity);
|
|
+ this.newPuffState = newPuffState;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public PufferFish getEntity() {
|
|
+ return (PufferFish) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the <strong>new</strong> puff state of the {@link PufferFish}.
|
|
+ * <p>
|
|
+ * This is what the {@link PufferFish}'s new puff state will be after this event if it isn't cancelled.<br>
|
|
+ * Refer to {@link PufferFish#getPuffState()} to get the current puff state.
|
|
+ *
|
|
+ * @return The <strong>new</strong> puff state, 0 being not inflated, 1 being slightly inflated and 2 being fully inflated
|
|
+ */
|
|
+ public int getNewPuffState() {
|
|
+ return this.newPuffState;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get if the {@link PufferFish} is going to inflate.
|
|
+ *
|
|
+ * @return If it's going to inflate
|
|
+ */
|
|
+ public boolean isInflating() {
|
|
+ return this.newPuffState > this.getEntity().getPuffState();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get if the {@link PufferFish} is going to deflate.
|
|
+ *
|
|
+ * @return If it's going to deflate
|
|
+ */
|
|
+ public boolean isDeflating() {
|
|
+ return this.newPuffState < this.getEntity().getPuffState();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set whether to cancel the {@link PufferFish} (in/de)flating.
|
|
+ *
|
|
+ * @param cancel {@code true} if you wish to cancel the (in/de)flation
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|