twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-31 04:02:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dried Ghast events and Happy Ghast spawn reason (#12788)

Browse Source
This commit is contained in:
Brokkonaut
2025-07-14 17:56:44 +02:00
committed by GitHub
parent 533d93c758
commit d9b5003fa1
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-api/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
View File

@@ -222,6 +222,10 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
* {@link org.bukkit.potion.PotionType#OOZING}, {@link org.bukkit.potion.PotionType#INFESTED}
*/
POTION_EFFECT,
/**
* When a creature is spawned by being rehydrated
*/
REHYDRATION,
/**
* When a creature is spawned by plugins
*/

33
paper-server/patches/sources/net/minecraft/world/level/block/DriedGhastBlock.java.patch Normal file
View File

@@ -0,0 +1,33 @@
--- a/net/minecraft/world/level/block/DriedGhastBlock.java
+++ b/net/minecraft/world/level/block/DriedGhastBlock.java
@@ -104,10 +_,20 @@
private void tickWaterlogged(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
if (!this.isReadyToSpawn(state)) {
+ // Paper start - Call BlockGrowEvent
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(level, pos, state.setValue(HYDRATION_LEVEL, this.getHydrationLevel(state) + 1), 2)) {
+ return;
+ }
+ // Paper end - Call BlockGrowEvent
level.playSound(null, pos, SoundEvents.DRIED_GHAST_TRANSITION, SoundSource.BLOCKS, 1.0F, 1.0F);
- level.setBlock(pos, state.setValue(HYDRATION_LEVEL, this.getHydrationLevel(state) + 1), 2);
+ // level.setBlock(pos, state.setValue(HYDRATION_LEVEL, this.getHydrationLevel(state) + 1), 2); // Paper - handled above
level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(state));
} else {
+ // Paper start - Call BlockFadeEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, state.getFluidState().createLegacyBlock()).isCancelled()) {
+ return;
+ }
+ // Paper end - Call BlockFadeEvent
this.spawnGhastling(level, pos, state);
}
}
@@ -121,7 +_,7 @@
float yRot = Direction.getYRot(state.getValue(FACING));
happyGhast.setYHeadRot(yRot);
happyGhast.snapTo(bottomCenter.x(), bottomCenter.y(), bottomCenter.z(), yRot, 0.0F);
- level.addFreshEntity(happyGhast);
+ level.addFreshEntity(happyGhast, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.REHYDRATION); // Paper - spawn reason
level.playSound(null, happyGhast, SoundEvents.GHASTLING_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
}
}