Shifting damage events per http://forums.bukkit.org/threads/oops-i-broke-your-plugins.599/#post-67424 (This breaks stuff!)

6 files changed, 3 insertions, 49 deletions

diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index ee9d2d53..0beea9c6 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -484,28 +484,6 @@ public abstract class Event {
         CREATURE_SPAWN (Category.LIVING_ENTITY),
 
         /**
-         * Called when a LivingEntity is damaged by the environment (for example,
-         * falling or lava)
-         *
-         * @see org.bukkit.event.entity.EntityDamageByBlockEvent
-         */
-        ENTITY_DAMAGEDBY_BLOCK (Category.LIVING_ENTITY),
-
-        /**
-         * Called when a LivingEntity is damaged by another LivingEntity
-         *
-         * @see org.bukkit.event.entity.EntityDamageByEntityEvent
-         */
-        ENTITY_DAMAGEDBY_ENTITY (Category.LIVING_ENTITY),
-
-        /**
-         * Called when a LivingEntity is damaged by a projectile Entity
-         *
-         * @see org.bukkit.event.entity.EntityDamageByProjectileEvent
-         */
-        ENTITY_DAMAGEDBY_PROJECTILE (Category.LIVING_ENTITY),
-
-        /**
          * Called when a LivingEntity is damaged with no source.
          *
          * @see org.bukkit.event.entity.EntityDamageEvent
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
index 93c8115c..cbb5e9d1 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
@@ -14,7 +14,7 @@ public class EntityDamageByBlockEvent extends EntityDamageEvent implements Cance
 
     public EntityDamageByBlockEvent(Block damager, Entity damagee, DamageCause cause, int damage)
     {
-        super(Event.Type.ENTITY_DAMAGEDBY_BLOCK, damagee, cause, damage);
+        super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
         this.damager = damager;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
index c9deafc3..af7de07d 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
@@ -13,7 +13,7 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent implements Canc
 
     public EntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage)
     {
-        super(Event.Type.ENTITY_DAMAGEDBY_ENTITY, damagee, cause, damage);
+        super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
         this.damager = damager;
     }
 
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
index 87bcb91a..d9cd88b2 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
@@ -11,7 +11,7 @@ public class EntityDamageByProjectileEvent extends EntityDamageByEntityEvent {
     private boolean bounce;

 

     public EntityDamageByProjectileEvent(Entity damager, Entity damagee, Entity projectile, DamageCause cause, int damage) {

-        super(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, damager, damagee, cause, damage);

+        super(Event.Type.ENTITY_DAMAGED, damager, damagee, cause, damage);

         this.projectile = projectile;

         Random random = new Random();

         this.bounce = random.nextBoolean();

diff --git a/src/main/java/org/bukkit/event/entity/EntityListener.java b/src/main/java/org/bukkit/event/entity/EntityListener.java
index d4595957..2cdacdf7 100644
--- a/src/main/java/org/bukkit/event/entity/EntityListener.java
+++ b/src/main/java/org/bukkit/event/entity/EntityListener.java
@@ -12,15 +12,6 @@ public class EntityListener implements Listener {
     public void onCreatureSpawn(CreatureSpawnEvent event) {
     }
 
-    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
-    }
-
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-    }
-
-    public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
-    }
-
     public void onEntityCombust(EntityCombustEvent event) {
     }
 
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index e82b9590..7c932bb3 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -313,21 +313,6 @@ public final class JavaPluginLoader implements PluginLoader {
             };
 
         // Entity Events
-        case ENTITY_DAMAGEDBY_BLOCK:
-            return new EventExecutor() { public void execute( Listener listener, Event event ) {
-                    ((EntityListener)listener).onEntityDamageByBlock( (EntityDamageByBlockEvent)event );
-                }
-            };
-        case ENTITY_DAMAGEDBY_ENTITY:
-            return new EventExecutor() { public void execute( Listener listener, Event event ) {
-                    ((EntityListener)listener).onEntityDamageByEntity( (EntityDamageByEntityEvent)event );
-                }
-            };
-        case ENTITY_DAMAGEDBY_PROJECTILE:
-            return new EventExecutor() { public void execute( Listener listener, Event event ) {
-                    ((EntityListener)listener).onEntityDamageByProjectile( (EntityDamageByProjectileEvent)event );
-                }
-            };
         case ENTITY_DAMAGED:
             return new EventExecutor() { public void execute( Listener listener, Event event ) {
                     ((EntityListener)listener).onEntityDamage( (EntityDamageEvent)event );