From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: HexedHero <6012891+HexedHero@users.noreply.github.com> Date: Mon, 10 May 2021 16:59:05 +0100 Subject: [PATCH] Add PufferFishStateChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java index 9498bac12196637c187961424ef23ecb77eddff8..3f0fad476fe573c3ba946a9436d1b3f7c5260ee2 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java @@ -101,25 +101,39 @@ public class Pufferfish extends AbstractFish { public void tick() { if (!this.level().isClientSide && this.isAlive() && this.isEffectiveAi()) { if (this.inflateCounter > 0) { + boolean increase = true; // Paper - Add PufferFishStateChangeEvent if (this.getPuffState() == 0) { + if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 1).callEvent()) { // Paper - Add PufferFishStateChangeEvent this.makeSound(SoundEvents.PUFFER_FISH_BLOW_UP); this.setPuffState(1); + } else { increase = false; } // Paper - Add PufferFishStateChangeEvent } else if (this.inflateCounter > 40 && this.getPuffState() == 1) { + if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 2).callEvent()) { // Paper - Add PufferFishStateChangeEvent this.makeSound(SoundEvents.PUFFER_FISH_BLOW_UP); this.setPuffState(2); + } else { increase = false; } // Paper - Add PufferFishStateChangeEvent } + if (increase) { // Paper - Add PufferFishStateChangeEvent ++this.inflateCounter; + } // Paper - Add PufferFishStateChangeEvent } else if (this.getPuffState() != 0) { + boolean increase = true; // Paper - Add PufferFishStateChangeEvent if (this.deflateTimer > 60 && this.getPuffState() == 2) { + if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 1).callEvent()) { // Paper - Add PufferFishStateChangeEvent this.makeSound(SoundEvents.PUFFER_FISH_BLOW_OUT); this.setPuffState(1); + } else { increase = false; } // Paper - Add PufferFishStateChangeEvent } else if (this.deflateTimer > 100 && this.getPuffState() == 1) { + if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 0).callEvent()) { // Paper - Add PufferFishStateChangeEvent this.makeSound(SoundEvents.PUFFER_FISH_BLOW_OUT); this.setPuffState(0); + } else { increase = false; } // Paper - Add PufferFishStateChangeEvent } + if (increase) { // Paper - Add PufferFishStateChangeEvent ++this.deflateTimer; + } // Paper - Add PufferFishStateChangeEvent } }