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

Clean up BlockFlowing

Browse Source
This commit is contained in:
md_5 2016-12-09 12:56:49 +11:00
parent f9eddf3f6e
commit 622630c823
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
nms-patches/BlockFlowing.patch
View File

@ -12,55 +12,42 @@
public class BlockFlowing extends BlockFluids { public class BlockFlowing extends BlockFluids {
int a; int a;
@@ -18,6 +23,11 @@ @@ -85,12 +90,25 @@
this.f(world, blockposition, iblockdata);
} }
public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) { + org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
+ // CraftBukkit start
+ org.bukkit.World bworld = world.getWorld();
+ org.bukkit.Server server = world.getServer();
+ org.bukkit.block.Block source = bworld == null ? null : bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ // CraftBukkit end
int i = ((Integer) iblockdata.get(BlockFlowing.LEVEL)).intValue();
byte b0 = 1;
@@ -88,9 +98,16 @@
IBlockData iblockdata2 = world.getType(blockposition.down()); IBlockData iblockdata2 = world.getType(blockposition.down());
if (this.h(world, blockposition.down(), iblockdata2)) { if (this.h(world, blockposition.down(), iblockdata2)) {
+ // CraftBukkit start - Send "down" to the server + // CraftBukkit start
+ BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN); + BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
+ if (server != null) { + world.getServer().getPluginManager().callEvent(event);
+ server.getPluginManager().callEvent(event); +
+ if (event.isCancelled()) {
+ return;
+ } + }
+ if (!event.isCancelled()) { + // CraftBukkit end
+
if (this.material == Material.LAVA && world.getType(blockposition.down()).getMaterial() == Material.WATER) { if (this.material == Material.LAVA && world.getType(blockposition.down()).getMaterial() == Material.WATER) {
- world.setTypeUpdate(blockposition.down(), Blocks.STONE.getBlockData()); - world.setTypeUpdate(blockposition.down(), Blocks.STONE.getBlockData());
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition.down(), Blocks.STONE, null)){ - this.fizz(world, blockposition.down());
this.fizz(world, blockposition.down()); + // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, blockposition.down(), Blocks.STONE, null)) {
+ this.fizz(world, blockposition.down());
+ } + }
+ // CraftBukkit end
return; return;
} }
@@ -99,6 +116,8 @@ @@ -116,14 +134,21 @@
} else {
this.flow(world, blockposition.down(), iblockdata2, i + 8);
}
+ }
+ // CraftBukkit end
} else if (i >= 0 && (i == 0 || this.g(world, blockposition.down(), iblockdata2))) {
Set set = this.c(world, blockposition);
@@ -116,14 +135,23 @@
while (iterator1.hasNext()) { while (iterator1.hasNext()) {
EnumDirection enumdirection1 = (EnumDirection) iterator1.next(); EnumDirection enumdirection1 = (EnumDirection) iterator1.next();
- this.flow(world, blockposition.shift(enumdirection1), world.getType(blockposition.shift(enumdirection1)), k); - this.flow(world, blockposition.shift(enumdirection1), world.getType(blockposition.shift(enumdirection1)), k);
+ // CraftBukkit start + // CraftBukkit start
+ BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1)); + BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1));
+ if (server != null) { + world.getServer().getPluginManager().callEvent(event);
+ server.getPluginManager().callEvent(event);
+ }
+ +
+ if (!event.isCancelled()) { + if (!event.isCancelled()) {
+ this.flow(world, blockposition.shift(enumdirection1), world.getType(blockposition.shift(enumdirection1)), k); + this.flow(world, blockposition.shift(enumdirection1), world.getType(blockposition.shift(enumdirection1)), k);