1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 80fb7e43fec..a1f37c65f1e 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -2102,6 +2102,10 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
     if (!isAlive())
         return false;
 
+    // we don't need help from non-combatant ;)
+    if (isCivilian())
+        return false;
+
     // skip fighting creature
     if (isInCombat())
         return false;