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

SPIGOT-7475: Don't fire SculkBloomEvent during world generation

Browse Source
This commit is contained in:
DerFrZocker 2023-09-06 19:09:38 +02:00
parent caee2311a4
commit ddc9a2dad3
No known key found for this signature in database
GPG Key ID: 713F71FFFE1DDF91
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nms-patches/net/minecraft/world/level/block/SculkSpreader.patch
View File

@ -41,24 +41,27 @@
Logger logger = SculkSpreader.LOGGER;
Objects.requireNonNull(logger);
@@ -146,6 +155,16 @@
@@ -146,6 +155,19 @@
private void addCursor(SculkSpreader.a sculkspreader_a) {
if (this.cursors.size() < 32) {
+ // CraftBukkit start
+ CraftBlock bukkitBlock = CraftBlock.at(level, sculkspreader_a.pos);
+ SculkBloomEvent event = new SculkBloomEvent(bukkitBlock, sculkspreader_a.getCharge());
+ Bukkit.getPluginManager().callEvent(event);
+ if (event.isCancelled())
+ return;
+ if (!isWorldGeneration()) { // CraftBukkit - SPIGOT-7475: Don't call event during world generation
+ CraftBlock bukkitBlock = CraftBlock.at(level, sculkspreader_a.pos);
+ SculkBloomEvent event = new SculkBloomEvent(bukkitBlock, sculkspreader_a.getCharge());
+ Bukkit.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return;
+ }
+
+ sculkspreader_a.charge = event.getCharge();
+ sculkspreader_a.charge = event.getCharge();
+ }
+ // CraftBukkit end
+
this.cursors.add(sculkspreader_a);
}
}
@@ -241,7 +260,7 @@
@@ -241,7 +263,7 @@
this.charge = i;
this.decayDelay = j;
this.updateDelay = k;