Updated for CraftBukkit 360

src/com/bukkit/mcteam/factions/Factions.java

@@ -36,41 +36,36 @@ public Factions(PluginLoader pluginLoader, Server instance,	PluginDescriptionFil
 		Factions.folder = folder;
 		Factions.plugin = plugin;
 		Factions.cLoader = cLoader;
+	}
+
+	@Override
+	public void onDisable() {
+		// TODO Auto-generated method stub
 
+	}
+
+	@Override
+	public void onEnable() {
 		Log.info("=== INIT START ===");
 		long timeInitStart = System.currentTimeMillis();
 		Log.info("You are running version: "+desc.getVersion());
-		
+
 		EM.loadAll();
-		
+
 		// Register events
-		PluginManager pm = instance.getPluginManager();
+		PluginManager pm = getServer().getPluginManager();
 		pm.registerEvent(Event.Type.PLAYER_CHAT, this.playerListener, Event.Priority.Highest, this);
 		pm.registerEvent(Event.Type.PLAYER_COMMAND, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_JOIN, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_MOVE, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.PLAYER_QUIT, this.playerListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.ENTITY_DEATH, this.entityListener, Event.Priority.Normal, this);
-		pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, this.entityListener, Event.Priority.Normal, this);
-		pm.registerEvent(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, this.entityListener, Event.Priority.Normal, this);
+		pm.registerEvent(Event.Type.ENTITY_DAMAGED, this.entityListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.BLOCK_DAMAGED, this.blockListener, Event.Priority.Normal, this);
 		pm.registerEvent(Event.Type.BLOCK_PLACED, this.blockListener, Event.Priority.Normal, this);
-		pm.registerEvent(Event.Type.BLOCK_INTERACT, this.blockListener, Event.Priority.Normal, this);		
-		
+		pm.registerEvent(Event.Type.BLOCK_INTERACT, this.blockListener, Event.Priority.Normal, this);
+
 		Log.info("=== INIT DONE (Took "+(System.currentTimeMillis()-timeInitStart)+"ms) ===");
 		Log.threshold = Conf.logThreshold;
 	}
-
-	@Override
-	public void onDisable() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void onEnable() {
-		// TODO Auto-generated method stub
-
-	}
-
 }

src/com/bukkit/mcteam/factions/listeners/FactionsEntityListener.java

@@ -7,13 +7,15 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageByProjectileEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityListener;
 
 import com.bukkit.mcteam.factions.Factions;
 import com.bukkit.mcteam.factions.entities.Conf;
 import com.bukkit.mcteam.factions.entities.Follower;
 import com.bukkit.mcteam.factions.struct.Relation;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 
 public class FactionsEntityListener extends EntityListener {
 	public Factions plugin;
@@ -33,36 +35,22 @@ public void onEntityDeath(EntityDeathEvent event) {
 		follower.onDeath();
 		follower.sendMessage(Conf.colorSystem+"Your power is now "+follower.getPowerRounded()+" / "+follower.getPowerMaxRounded());
 	}
-	/**
-	 * Who can I hurt?
-	 * I can never hurt members or allies.
-	 * I can always hurt enemies.
-	 * I can hurt neutrals as long as they are outside their own territory.
-	 */
+
 	@Override
-	public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+	public void onEntityDamage(EntityDamageEvent event) {
 		if ( event.isCancelled()) {
 			return; // Some other plugin decided. Alright then.
 		}
-
-		if ( ! this.canDamagerHurtDamagee(event.getDamager(), event.getEntity(), event.getDamage())) {
-			event.setCancelled(true);
-		}
-	}
-
-	@Override
-	public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
-		//DamageCause dc = event.getCause();
-		//Log.debug("dc.toString(): "+dc.toString());
-		//Log.debug("event.getDamager().getClass(): "+event.getDamager().getClass());
-		//Log.debug("event.getEntity().getClass(): "+event.getEntity().getClass());
-
-		if ( event.isCancelled()) {
-			return; // Some other plugin decided. Alright then.
+		try
+		{
+			if ( event.getCause() == DamageCause.ENTITY_ATTACK ) {
+				if ( ! this.canDamagerHurtDamagee(((EntityDamageByEntityEvent)event).getDamager(), event.getEntity(), event.getDamage())) {
+					event.setCancelled(true);
+				}
+			}
 		}
-
-		if ( ! this.canDamagerHurtDamagee(event.getDamager(), event.getEntity(), event.getDamage())) {
-			event.setCancelled(true);
+		catch (Throwable ex)
+		{
 		}
 	}