mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
92 lines
2.9 KiB
Diff
92 lines
2.9 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..3585457b21aca2a2f1779868a0fa91f8011ad3c9
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/PufferFishStateChangeEvent.java
|
|
@@ -0,0 +1,80 @@
|
|
+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.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called just before a {@link PufferFish} inflates or deflates.
|
|
+ */
|
|
+public class PufferFishStateChangeEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private int newPuffState;
|
|
+
|
|
+ public PufferFishStateChangeEvent(@NotNull PufferFish entity, int newPuffState) {
|
|
+ super(entity);
|
|
+ this.newPuffState = newPuffState;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public PufferFish getEntity() {
|
|
+ return (PufferFish) entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * 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 its going to inflate
|
|
+ */
|
|
+ public boolean isInflating() {
|
|
+ return getNewPuffState() > getEntity().getPuffState();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get if the {@link PufferFish} is going to deflate.
|
|
+ * @return If its going to deflate
|
|
+ */
|
|
+ public boolean isDeflating() {
|
|
+ return getNewPuffState() < getEntity().getPuffState();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set whether or not to cancel the {@link PufferFish} (in/de)flating.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel the (in/de)flation
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|