From 9bc3b7df2448ed2d3601e113a673e70599a24152 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Fri, 20 Dec 2013 17:36:09 -0500 Subject: [Bleeding] Call event when reflecting fireballs. Adds BUKKIT-5214 --- src/main/java/net/minecraft/server/EntityFireball.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main') diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index 6915c374..82da554b 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -2,6 +2,8 @@ package net.minecraft.server; import java.util.List; +import org.bukkit.event.entity.EntityDamageByEntityEvent; // CraftBukkit + public abstract class EntityFireball extends Entity { private int e = -1; @@ -231,6 +233,16 @@ public abstract class EntityFireball extends Entity { } else { this.Q(); if (damagesource.getEntity() != null) { + // CraftBukkit start + EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damagesource.getEntity().getBukkitEntity(), this.getBukkitEntity(), org.bukkit.event.entity.EntityDamageEvent.DamageCause.ENTITY_ATTACK, f); + + world.getServer().getPluginManager().callEvent(event); + + if (event.isCancelled()) { + return false; + } + // CraftBukkit end + Vec3D vec3d = damagesource.getEntity().ag(); if (vec3d != null) { -- cgit v1.2.3