Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a check to prevent the ' Jousting' after a hit observed by Switeck.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4386 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2011-02-20 13:02:42 +00:00
parent a2790a34da
commit ebdb82a6de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Entities/ShipEntity.m
View File

@ -8769,7 +8769,7 @@ Vector positionOffsetForShipInRotationToAlignment(ShipEntity* ship, Quaternion q
[hunter markAsOffender:64];
}
if ([hunter group] == group || (iAmTheLaw && uAreTheLaw))
if ((group != nil && [hunter group] == group) || (iAmTheLaw && uAreTheLaw))
{
// avoid shooting each other
if ([hunter behaviour] == BEHAVIOUR_ATTACK_FLY_TO_TARGET) // avoid me please!