From 2a43bce849850b78411a668203758aae019224e3 Mon Sep 17 00:00:00 2001
From: ProfLuz <robluzzle@gmail.com>
Date: Mon, 1 Oct 2018 22:21:22 -0400
Subject: [PATCH] Fix spectators being affected by a combat ability (#3591)

* Fix spectators being affected by a combat ability
---
 .../java/com/gmail/nossr50/util/skills/CombatUtils.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index d4453be7b..230481451 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -4,6 +4,7 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Animals;
@@ -544,6 +545,11 @@ public final class CombatUtils {
             if (!player.canSee(defender)) {
                 return false;
             }
+            
+            // Spectators should not be affected 
+            if (defender.getGameMode() == GameMode.SPECTATOR) {
+                return false;
+            }
 
             // It may seem a bit redundant but we need a check here to prevent bleed from being applied in applyAbilityAoE()
             if (callFakeDamageEvent(player, entity, 1.0) == 0) {