SPIGOT-512: Fix SmallFireballs ignoring isIncendiary

Dieser Commit ist enthalten in:
Thinkofdeath 2015-02-02 22:01:05 +00:00
Ursprung 386dc55b83
Commit 2173630846

Datei anzeigen

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntitySmallFireball.java 2014-11-28 17:43:43.161707434 +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 2014-11-28 17:38:23.000000000 +0000 +++ src/main/java/net/minecraft/server/EntitySmallFireball.java 2015-02-02 22:00:57.824074092 +0000
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package net.minecraft.server; package net.minecraft.server;
@ -30,7 +30,7 @@
if (this.world.isEmpty(blockposition)) { if (this.world.isEmpty(blockposition)) {
- this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData()); - this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ // CraftBukkit start + // 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()); + this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ } + }
+ // CraftBukkit end + // CraftBukkit end