From 3d699e612a1e4183016bb02886b2cac6fa0373dd Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 13 Feb 2012 09:31:11 -0800
Subject: [PATCH] Changed listener to Highest, reverting some stuff that
 doesn't work.

---
 .../datatypes/FakeEntityDamageEvent.java      | 27 -------------------
 .../nossr50/listeners/mcBlockListener.java    |  1 +
 .../nossr50/listeners/mcEntityListener.java   |  7 ++---
 src/main/java/com/gmail/nossr50/m.java        | 15 -----------
 4 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 src/main/java/com/gmail/nossr50/datatypes/FakeEntityDamageEvent.java

diff --git a/src/main/java/com/gmail/nossr50/datatypes/FakeEntityDamageEvent.java b/src/main/java/com/gmail/nossr50/datatypes/FakeEntityDamageEvent.java
deleted file mode 100644
index 181f87e96..000000000
--- a/src/main/java/com/gmail/nossr50/datatypes/FakeEntityDamageEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-    This file is part of mcMMO.
-
-    mcMMO is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    mcMMO is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mcMMO.  If not, see <http://www.gnu.org/licenses/>.
-*/
-package com.gmail.nossr50.datatypes;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.event.entity.EntityDamageEvent;
-
-public class FakeEntityDamageEvent extends EntityDamageEvent {
-    public FakeEntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
-        super(damagee, cause, damage);
-    }
-    private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 9d8d99925..7d4d3853e 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -146,6 +146,7 @@ public class mcBlockListener implements Listener
     	ItemStack inhand = player.getItemInHand();
     	if(event.isCancelled())
     		return;
+    	
     	if (event instanceof FakeBlockBreakEvent) 
     		return;
     	
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
index 641ebbbd8..6005ffbfa 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -53,13 +53,9 @@ public class mcEntityListener implements Listener
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityDamage(EntityDamageEvent event) 
     {
-        //Pass around a fake event to see if any plugins cancel it
-        if(!m.EntityDamageEventSimulate(event.getEntity(), event.getCause(), event.getDamage()))
-            return;
-        
     	if(event.isCancelled())
     		return;
     	
@@ -70,6 +66,7 @@ public class mcEntityListener implements Listener
     		if(eventb.getEntity() instanceof Player && eventb.getDamager() instanceof Player && !event.getEntity().getWorld().getPVP())
     			return;
     	}
+    	
     	/*
     	 * CHECK FOR INVULNERABILITY
     	 */
diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/m.java
index 8d0c9fc0d..11b03917d 100644
--- a/src/main/java/com/gmail/nossr50/m.java
+++ b/src/main/java/com/gmail/nossr50/m.java
@@ -26,10 +26,8 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.*;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.config.*;
-import com.gmail.nossr50.datatypes.FakeEntityDamageEvent;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.FakeBlockBreakEvent;
 import com.gmail.nossr50.datatypes.SkillType;
@@ -146,19 +144,6 @@ public class m
 			return false; //Return false if something went wrong
 		}
 	}
-	
-	public static boolean EntityDamageEventSimulate(Entity damagee, DamageCause cause, int damage)
-	{
-	    FakeEntityDamageEvent event = new FakeEntityDamageEvent(damagee, cause, damage);
-	    
-	    Bukkit.getServer().getPluginManager().callEvent(event);
-	    if(!event.isCancelled())
-        {
-            return true; //Return true if not cancelled
-        } else {
-            return false; //Return false if cancelled
-        }
-	}
 
 	public static void damageTool(Player player, short damage)
 	{