mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
90fe0d58a5
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: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
51 lines
3.5 KiB
Diff
51 lines
3.5 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: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 50ffcbb50e061f0b3307a5b963bbab81427cac3e..a197337f2e09f53cf382022569c8836745d78769 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
|
|
@@ -95,25 +95,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.playSound(SoundEvents.PUFFER_FISH_BLOW_UP, this.getSoundVolume(), this.getVoicePitch());
|
|
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.playSound(SoundEvents.PUFFER_FISH_BLOW_UP, this.getSoundVolume(), this.getVoicePitch());
|
|
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.playSound(SoundEvents.PUFFER_FISH_BLOW_OUT, this.getSoundVolume(), this.getVoicePitch());
|
|
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.playSound(SoundEvents.PUFFER_FISH_BLOW_OUT, this.getSoundVolume(), this.getVoicePitch());
|
|
this.setPuffState(0);
|
|
+ } else { increase = false; } // Paper - Add PufferFishStateChangeEvent
|
|
}
|
|
|
|
+ if (increase) { // Paper - Add PufferFishStateChangeEvent
|
|
++this.deflateTimer;
|
|
+ } // Paper - Add PufferFishStateChangeEvent
|
|
}
|
|
}
|
|
|