From 598c507849319bfc6180dfcb56be3cc6e90deef6 Mon Sep 17 00:00:00 2001
From: NuclearW <incongruency@gmail.com>
Date: Sun, 5 Feb 2012 15:07:35 -0500
Subject: [PATCH] Don't counter-attack non-LivingEntity Closes #100 Closes #107

---
 src/main/java/com/gmail/nossr50/skills/Swords.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/Swords.java b/src/main/java/com/gmail/nossr50/skills/Swords.java
index dec6ab17c..d944650b4 100644
--- a/src/main/java/com/gmail/nossr50/skills/Swords.java
+++ b/src/main/java/com/gmail/nossr50/skills/Swords.java
@@ -17,7 +17,6 @@
 package com.gmail.nossr50.skills;
 
 import org.bukkit.ChatColor;
-import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -175,11 +174,11 @@ public class Swords
     
     public static void counterAttackChecks(EntityDamageByEntityEvent event)
     {
-    	//Don't want to counter attack arrows
+    	//Don't want to counter attack stuff not alive
     	
-    	if(event.getDamager() instanceof Arrow)
+    	if(!(event.getDamager() instanceof LivingEntity))
     		return;
-    	
+
 	    if(event instanceof EntityDamageByEntityEvent)
 	    {
 	    	Entity f = ((EntityDamageByEntityEvent) event).getDamager();