From 21736308468155508e57ef7453a3927043c7ba57 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Mon, 2 Feb 2015 22:01:05 +0000 Subject: SPIGOT-512: Fix SmallFireballs ignoring isIncendiary --- nms-patches/EntitySmallFireball.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nms-patches') diff --git a/nms-patches/EntitySmallFireball.patch b/nms-patches/EntitySmallFireball.patch index 4f21a9a1..ffca2358 100644 --- a/nms-patches/EntitySmallFireball.patch +++ b/nms-patches/EntitySmallFireball.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntitySmallFireball.java 2014-11-28 17:43:43.161707434 +0000 -+++ src/main/java/net/minecraft/server/EntitySmallFireball.java 2014-11-28 17:38:23.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/EntitySmallFireball.java 2015-02-02 22:00:57.824074092 +0000 ++++ src/main/java/net/minecraft/server/EntitySmallFireball.java 2015-02-02 22:00:57.824074092 +0000 @@ -1,5 +1,7 @@ package net.minecraft.server; @@ -30,7 +30,7 @@ if (this.world.isEmpty(blockposition)) { - this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData()); + // CraftBukkit start -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) { ++ if (isIncendiary && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) { + this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData()); + } + // CraftBukkit end -- cgit v1.2.3