From e77be3350f279d7e6502ed8d9d8e28fdf6caef82 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 13 Feb 2012 19:09:14 -0800
Subject: [PATCH] Removed CallEvent from dealDamage(), we don't need it. Fixes
 #170

---
 src/main/java/com/gmail/nossr50/Combat.java         | 13 ++-----------
 .../gmail/nossr50/listeners/mcEntityListener.java   |  1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java
index 9fed58edc..8402d22a0 100644
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -16,7 +16,6 @@
 */
 package com.gmail.nossr50;
 
-import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -377,11 +376,7 @@ public class Combat
      * @param cause DamageCause to pass to damage event
      */
     public static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
-    	EntityDamageEvent ede = new EntityDamageEvent(target, cause, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
+    	target.damage(dmg);
     }
     
     /**
@@ -392,11 +387,7 @@ public class Combat
      * @param attacker Player to pass to event as damager
      */
     public static void dealDamage(LivingEntity target, int dmg, Player attacker) {
-    	EntityDamageEvent ede = new EntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
-    	Bukkit.getPluginManager().callEvent(ede);
-    	if(ede.isCancelled()) return;
-    	
-    	target.damage(ede.getDamage());
+    	target.damage(dmg);
     }
     
     public static boolean pvpAllowed(EntityDamageByEntityEvent event, World world)
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
index 6005ffbfa..fccc1f259 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -33,7 +33,6 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;