summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunther De Wachter <GuntherDW@gmail.com>2011-03-17 18:27:32 +0100
committerErik Broes <erikbroes@grum.nl>2011-03-17 20:01:24 +0100
commitb6f87bb23c7e5d980f7a4765616695a2348239b1 (patch)
tree1aa4ce2be698478cd7de708fe0d44e0e10e91757
parentd732457354f667e11feee0e64b00593739a2f69e (diff)
downloadcraftbukkit-b6f87bb23c7e5d980f7a4765616695a2348239b1.tar
craftbukkit-b6f87bb23c7e5d980f7a4765616695a2348239b1.tar.gz
craftbukkit-b6f87bb23c7e5d980f7a4765616695a2348239b1.tar.lz
craftbukkit-b6f87bb23c7e5d980f7a4765616695a2348239b1.tar.xz
craftbukkit-b6f87bb23c7e5d980f7a4765616695a2348239b1.zip
Fireballs now give their entity to the damage handler
-rw-r--r--src/main/java/net/minecraft/server/EntityFireball.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index 04394a38..2f2b626d 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