summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-02-02 22:01:05 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-02-02 22:01:05 +0000
commit21736308468155508e57ef7453a3927043c7ba57 (patch)
tree1ae9c8b129ea7f09d9d23c22c9fc38f8c760fb0a
parent386dc55b83d6d8ea493613df21f155f37a761006 (diff)
downloadcraftbukkit-21736308468155508e57ef7453a3927043c7ba57.tar
craftbukkit-21736308468155508e57ef7453a3927043c7ba57.tar.gz
craftbukkit-21736308468155508e57ef7453a3927043c7ba57.tar.lz
craftbukkit-21736308468155508e57ef7453a3927043c7ba57.tar.xz
craftbukkit-21736308468155508e57ef7453a3927043c7ba57.zip
SPIGOT-512: Fix SmallFireballs ignoring isIncendiary
-rw-r--r--nms-patches/EntitySmallFireball.patch6
1 files changed, 3 insertions, 3 deletions
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