From b6f87bb23c7e5d980f7a4765616695a2348239b1 Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Thu, 17 Mar 2011 18:27:32 +0100 Subject: [PATCH] Fireballs now give their entity to the damage handler --- src/main/java/net/minecraft/server/EntityFireball.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index 04394a380..2f2b626d7 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -154,7 +154,8 @@ public class EntityFireball extends Entity { ExplosionPrimedEvent event = new ExplosionPrimedEvent(eventType, CraftEntity.getEntity(server, this), 1.0F, false); server.getPluginManager().callEvent(event); if (!event.isCancelled()) { - this.world.a((Entity) null, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire()); + // give 'this' instead of (Entity) null so we know what causes the damage + this.world.a(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire()); this.C(); } // CraftBukkit end