Index: core3/branches/unstable/MMOCoreORB/src/server/zone/managers/combat/CombatManager.cpp
===================================================================
diff -u -N -r5839 -r5894
--- core3/branches/unstable/MMOCoreORB/src/server/zone/managers/combat/CombatManager.cpp	(.../CombatManager.cpp)	(revision 5839)
+++ core3/branches/unstable/MMOCoreORB/src/server/zone/managers/combat/CombatManager.cpp	(.../CombatManager.cpp)	(revision 5894)
@@ -191,6 +191,9 @@
 
 	Locker clocker(tano, attacker);
 
+	if (!tano->isAttackableBy(attacker))
+		return 0;
+
 	attacker->addDefender(tano);
 	tano->addDefender(attacker);
 
@@ -1392,11 +1395,6 @@
 				continue;
 			}
 
-			if (!tano->isAttackableBy(attacker)) {
-				//error("object is not attackable");
-				continue;
-			}
-
 			if (tano->isCreatureObject() && (cast<CreatureObject*>(tano))->isIncapacitated()) {
 				//error("object is incapacitated");
 				continue;