From 4342ea7c7fa5f8b88c8b6769c9b5c132491b10e8 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Thu, 20 Jan 2011 20:22:34 +1100 Subject: [PATCH] fix for entity damaged by projectile event --- .../org/bukkit/event/entity/EntityDamageByEntityEvent.java | 6 ++++++ .../bukkit/event/entity/EntityDamageByProjectileEvent.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java index c2b347e5..aba87db9 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -16,6 +16,12 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent implements Canc super(Event.Type.ENTITY_DAMAGEDBY_ENTITY, damagee, cause, damage); this.damager = damager; } + + protected EntityDamageByEntityEvent(Type damageType, Entity damager, Entity damagee, DamageCause cause, int damage) + { + super(damageType, damagee, cause, damage); + this.damager = damager; + } /** * Returns the entity that damaged the defender. diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java index 96529bd6..87bcb91a 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java @@ -3,6 +3,7 @@ package org.bukkit.event.entity; import java.util.Random; import org.bukkit.entity.Entity; +import org.bukkit.event.Event; public class EntityDamageByProjectileEvent extends EntityDamageByEntityEvent { @@ -10,7 +11,7 @@ public class EntityDamageByProjectileEvent extends EntityDamageByEntityEvent { private boolean bounce; public EntityDamageByProjectileEvent(Entity damager, Entity damagee, Entity projectile, DamageCause cause, int damage) { - super(damager, damagee, cause, damage); + super(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, damager, damagee, cause, damage); this.projectile = projectile; Random random = new Random(); this.bounce = random.nextBoolean();