Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1522: Call BlockFormEvent when an Eyeblossom opens or closes

Browse Source
This commit is contained in:
Brokkonaut 2024-12-10 20:25:34 +11:00 committed by md_5
parent 665900b914
commit a7eb3fdfd8
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nms-patches/net/minecraft/world/level/block/BlockFlowerPot.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/net/minecraft/world/level/block/BlockFlowerPot.java
+++ b/net/minecraft/world/level/block/BlockFlowerPot.java
@@ -137,11 +137,14 @@
boolean flag1 = CreakingHeartBlock.isNaturalNight(worldserver);
if (flag != flag1) {
- worldserver.setBlock(blockposition, this.opposite(iblockdata), 3);
- EyeblossomBlock.a eyeblossomblock_a = EyeblossomBlock.a.fromBoolean(flag).transform();
+ // CraftBukkit start - BlockFormEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldserver, blockposition, this.opposite(iblockdata), 3)) {
+ EyeblossomBlock.a eyeblossomblock_a = EyeblossomBlock.a.fromBoolean(flag).transform();
- eyeblossomblock_a.spawnTransformParticle(worldserver, blockposition, randomsource);
- worldserver.playSound((EntityHuman) null, blockposition, eyeblossomblock_a.longSwitchSound(), SoundCategory.BLOCKS, 1.0F, 1.0F);
+ eyeblossomblock_a.spawnTransformParticle(worldserver, blockposition, randomsource);
+ worldserver.playSound((EntityHuman) null, blockposition, eyeblossomblock_a.longSwitchSound(), SoundCategory.BLOCKS, 1.0F, 1.0F);
+ }
+ // CraftBukkit end
}
}

15
nms-patches/net/minecraft/world/level/block/EyeblossomBlock.patch Normal file
View File

@ -0,0 +1,15 @@
--- a/net/minecraft/world/level/block/EyeblossomBlock.java
+++ b/net/minecraft/world/level/block/EyeblossomBlock.java
@@ -88,7 +88,11 @@
} else {
EyeblossomBlock.a eyeblossomblock_a = this.type.transform();
- worldserver.setBlock(blockposition, eyeblossomblock_a.state(), 3);
+ // CraftBukkit start - BlockFormEvent
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(worldserver, blockposition, eyeblossomblock_a.state(), 3)) {
+ return false;
+ }
+ // CraftBukkit end
worldserver.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.a.of(iblockdata));
eyeblossomblock_a.spawnTransformParticle(worldserver, blockposition, randomsource);
BlockPosition.betweenClosed(blockposition.offset(-3, -2, -3), blockposition.offset(3, 2, 3)).forEach((blockposition1) -> {