Merge pull request #338 from WALLOFJUSTICE/dev-doom

* Fix crash when friendly fire enabled in sanctum map, was using wron…
TurningWheel · Mar 18, 2018 · 50a61b5 · 50a61b5
2 parents 8b491f2 + 4a8053d
commit 50a61b5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/entity.cpp b/src/entity.cpp
@@ -4371,12 +4371,12 @@ void Entity::attack(int pose, int charge, Entity* target)
 				{
 					return;
 				}
-				if ( (myStats->type == LICH_FIRE && entity->getRace() == LICH_ICE)
-					|| (myStats->type == LICH_ICE && entity->getRace() == LICH_FIRE) )
-				{
-					// friendship <3
-					return;
-				}
+			}
+			else if ( (myStats->type == LICH_FIRE && hit.entity->getRace() == LICH_ICE)
+				|| (myStats->type == LICH_ICE && hit.entity->getRace() == LICH_FIRE) )
+			{
+				// friendship <3
+				return;
 			}
 
 			if ( hit.entity->behavior == &actBoulder )