45 Zeilen
2.3 KiB
Diff
45 Zeilen
2.3 KiB
Diff
|
--- a/net/minecraft/server/FluidTypeLava.java
|
||
|
|
+++ b/net/minecraft/server/FluidTypeLava.java
|
||
|
|
@@ -35,6 +35,13 @@
|
||
|
|
|
||
|
|
if (iblockdata.isAir()) {
|
||
|
|
if (this.a((IWorldReader) world, blockposition1)) {
|
||
|
|
+ // CraftBukkit start - Prevent lava putting something on fire
|
||
|
|
+ if (world.getType(blockposition1) != Blocks.FIRE) {
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition1, blockposition).isCancelled()) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
world.setTypeUpdate(blockposition1, Blocks.FIRE.getBlockData());
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
@@ -51,6 +58,14 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
if (world.isEmpty(blockposition2.up()) && this.b(world, blockposition2)) {
|
||
|
|
+ // CraftBukkit start - Prevent lava putting something on fire
|
||
|
|
+ BlockPosition up = blockposition2.up();
|
||
|
|
+ if (world.getType(up) != Blocks.FIRE) {
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, up, blockposition).isCancelled()) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
world.setTypeUpdate(blockposition2.up(), Blocks.FIRE.getBlockData());
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -139,7 +154,11 @@
|
||
|
|
|
||
|
|
if (this.a(TagsFluid.b) && fluid1.a(TagsFluid.a)) {
|
||
|
|
if (iblockdata.getBlock() instanceof BlockFluids) {
|
||
|
|
- generatoraccess.setTypeAndData(blockposition, Blocks.STONE.getBlockData(), 3);
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(generatoraccess.getMinecraftWorld(), blockposition, Blocks.STONE.getBlockData(), 3)) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
}
|
||
|
|
|
||
|
|
this.a(generatoraccess, blockposition);
|