Browse Source

Don't counter-attack non-LivingEntity
Closes #100
Closes #107

NuclearW 13 years ago
parent
commit
598c507849
1 changed files with 3 additions and 4 deletions
  1. 3 4
      src/main/java/com/gmail/nossr50/skills/Swords.java

+ 3 - 4
src/main/java/com/gmail/nossr50/skills/Swords.java

@@ -17,7 +17,6 @@
 package com.gmail.nossr50.skills;
 package com.gmail.nossr50.skills;
 
 
 import org.bukkit.ChatColor;
 import org.bukkit.ChatColor;
-import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Player;
@@ -175,11 +174,11 @@ public class Swords
     
     
     public static void counterAttackChecks(EntityDamageByEntityEvent event)
     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;
     		return;
-    	
+
 	    if(event instanceof EntityDamageByEntityEvent)
 	    if(event instanceof EntityDamageByEntityEvent)
 	    {
 	    {
 	    	Entity f = ((EntityDamageByEntityEvent) event).getDamager();
 	    	Entity f = ((EntityDamageByEntityEvent) event).getDamager();