diff options
| author | HexedHero <[email protected]> | 2021-05-27 16:14:52 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-27 15:14:52 +0000 |
| commit | ceb3762fb1eb9a4b2466a58e9318a221ad031c9e (patch) | |
| tree | 4b2295531520ec3ea0ea892259b4ab6e62484a86 /Spigot-Server-Patches | |
| parent | cd4defec04661535af78c27a4b7ed6cc619ecfe8 (diff) | |
| download | Paper-ceb3762fb1eb9a4b2466a58e9318a221ad031c9e.tar.gz Paper-ceb3762fb1eb9a4b2466a58e9318a221ad031c9e.zip | |
Add PufferFishStateChangeEvent (#5606)
Diffstat (limited to 'Spigot-Server-Patches')
| -rw-r--r-- | Spigot-Server-Patches/0748-Add-PufferFishStateChangeEvent.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0748-Add-PufferFishStateChangeEvent.patch b/Spigot-Server-Patches/0748-Add-PufferFishStateChangeEvent.patch new file mode 100644 index 0000000000..df5245c824 --- /dev/null +++ b/Spigot-Server-Patches/0748-Add-PufferFishStateChangeEvent.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: HexedHero <[email protected]> +Date: Mon, 10 May 2021 16:59:05 +0100 +Subject: [PATCH] Add PufferFishStateChangeEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/animal/EntityPufferFish.java b/src/main/java/net/minecraft/world/entity/animal/EntityPufferFish.java +index e9f20d387ccdacfbb1a48dc31e2a6cd4843a0d7b..4e4327b3cb84367534c6f5855cf8b89763b1419d 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/EntityPufferFish.java ++++ b/src/main/java/net/minecraft/world/entity/animal/EntityPufferFish.java +@@ -89,25 +89,39 @@ public class EntityPufferFish extends EntityFish { + public void tick() { + if (!this.world.isClientSide && this.isAlive() && this.doAITick()) { + if (this.c > 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.playSound(SoundEffects.ENTITY_PUFFER_FISH_BLOW_UP, this.getSoundVolume(), this.dH()); + this.setPuffState(1); ++ } else { increase = false; } // Paper - Add PufferFishStateChangeEvent + } else if (this.c > 40 && this.getPuffState() == 1) { ++ if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 2).callEvent()) { // Paper - Add PufferFishStateChangeEvent + this.playSound(SoundEffects.ENTITY_PUFFER_FISH_BLOW_UP, this.getSoundVolume(), this.dH()); + this.setPuffState(2); ++ } else { increase = false; } // Paper - Add PufferFishStateChangeEvent + } + ++ if (increase) { // Paper - Add PufferFishStateChangeEvent + ++this.c; ++ } // Paper - Add PufferFishStateChangeEvent + } else if (this.getPuffState() != 0) { ++ boolean increase = true; // Paper - Add PufferFishStateChangeEvent + if (this.d > 60 && this.getPuffState() == 2) { ++ if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 1).callEvent()) { // Paper - Add PufferFishStateChangeEvent + this.playSound(SoundEffects.ENTITY_PUFFER_FISH_BLOW_OUT, this.getSoundVolume(), this.dH()); + this.setPuffState(1); ++ } else { increase = false; } // Paper - Add PufferFishStateChangeEvent + } else if (this.d > 100 && this.getPuffState() == 1) { ++ if (new io.papermc.paper.event.entity.PufferFishStateChangeEvent((org.bukkit.entity.PufferFish) getBukkitEntity(), 0).callEvent()) { // Paper - Add PufferFishStateChangeEvent + this.playSound(SoundEffects.ENTITY_PUFFER_FISH_BLOW_OUT, this.getSoundVolume(), this.dH()); + this.setPuffState(0); ++ } else { increase = false; } // Paper - Add PufferFishStateChangeEvent + } + ++ if (increase) { // Paper - Add PufferFishStateChangeEvent + ++this.d; ++ } // Paper - Add PufferFishStateChangeEvent + } + } + |