summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemFireball.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ItemFireball.patch')
-rw-r--r--nms-patches/ItemFireball.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/nms-patches/ItemFireball.patch b/nms-patches/ItemFireball.patch
new file mode 100644
index 00000000..6a754928
--- /dev/null
+++ b/nms-patches/ItemFireball.patch
@@ -0,0 +1,19 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ItemFireball.java 2014-11-27 08:59:46.777421512 +1100
++++ src/main/java/net/minecraft/server/ItemFireball.java 2014-11-27 08:42:10.124850965 +1100
+@@ -15,7 +15,15 @@
+ return false;
+ } else {
+ if (world.getType(blockposition).getBlock().getMaterial() == Material.AIR) {
+- world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "item.fireCharge.use", 1.0F, (ItemFireball.g.nextFloat() - ItemFireball.g.nextFloat()) * 0.2F + 1.0F);
++ // CraftBukkit start - fire BlockIgniteEvent
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FIREBALL, entityhuman).isCancelled()) {
++ if (!entityhuman.abilities.canInstantlyBuild) {
++ --itemstack.count;
++ }
++ return false;
++ }
++ // CraftBukkit end
++ world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "item.fireCharge.use", 1.0F, (g.nextFloat() - g.nextFloat()) * 0.2F + 1.0F);
+ world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ }
+