diff options
| author | Yariv Livay <yarivlivay@gmail.com> | 2013-03-17 22:46:48 +0200 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-18 12:47:01 -0500 |
| commit | a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4 (patch) | |
| tree | cc24b480e39c5346abb8d6c6632b318bb6cba23c /src/main/java/net/minecraft/server/EntitySmallFireball.java | |
| parent | 2e6cfdb3cc9147d49c050dbd21a6ae37c3a916dd (diff) | |
| download | craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.gz craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.lz craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.tar.xz craftbukkit-a7a5f273e3765a819f7d2ac71b4be4dbd28f9db4.zip | |
Implement new cause versions of BlockIgniteEvent. Addresses BUKKIT-3609, BUKKIT-3656, BUKKIT-3657
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySmallFireball.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntitySmallFireball.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java index a7e7915b..6d623d10 100644 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java @@ -1,7 +1,7 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.event.block.BlockIgniteEvent; +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit end @@ -67,11 +67,7 @@ public class EntitySmallFireball extends EntityFireball { if (this.world.isEmpty(i, j, k)) { // CraftBukkit start - org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k); - BlockIgniteEvent event = new BlockIgniteEvent(block, BlockIgniteEvent.IgniteCause.FIREBALL, null); - world.getServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { + if (!CraftEventFactory.callBlockIgniteEvent(world, i, j, k, this).isCancelled()) { this.world.setTypeIdUpdate(i, j, k, Block.FIRE.id); } // CraftBukkit end |