summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorBlackHole <black-hole@live.com>2016-03-09 19:21:29 +0100
committermd_5 <git@md-5.net>2016-03-10 07:49:39 +1100
commita602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76 (patch)
treee1bce4ba5a6d369b56eaaa993a182c7635d928e7 /nms-patches
parentdaf45148d1e35cf279ace8188ed851d0f3d4d835 (diff)
downloadcraftbukkit-a602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76.tar
craftbukkit-a602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76.tar.gz
craftbukkit-a602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76.tar.lz
craftbukkit-a602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76.tar.xz
craftbukkit-a602cb2e8ce8891ebdc9cab2e39fb0fce2e8cc76.zip
Call EntityChangedBlockEvent for water splash potions extinguishing fire
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityPotion.patch8
1 files changed, 8 insertions, 0 deletions
diff --git a/nms-patches/EntityPotion.patch b/nms-patches/EntityPotion.patch
index 8d6ccdb5..b8469651 100644
--- a/nms-patches/EntityPotion.patch
+++ b/nms-patches/EntityPotion.patch
@@ -115,3 +115,11 @@
}
}
+@@ -151,6 +186,7 @@
+
+ private void a(BlockPosition blockposition) {
+ if (this.world.getType(blockposition).getBlock() == Blocks.FIRE) {
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) return; // CraftBukkit
+ this.world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 2);
+ }
+