[Planeshift-cvs] CVS: planeshift/src/server npcmanager.cpp,1.120,1.121

[DaveG <da...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10753/src/server

Modified Files:
	npcmanager.cpp 
Log Message:
fixing a bug where NPCs couldn't attack GMs

Index: npcmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/npcmanager.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** npcmanager.cpp	8 Apr 2006 06:20:14 -0000	1.120
--- npcmanager.cpp	10 Apr 2006 06:37:34 -0000	1.121
***************
*** 503,508 ****
                              psserver->combatmanager->StopAttack(attacker);
  
!                         Client* client = target->GetClient();
!                         if(!client || client->GetSecurityLevel() < 21)
                          {
                              psserver->combatmanager->AttackSomeone(attacker,target,3);  // always "normal" attack by npc for now
--- 503,507 ----
                              psserver->combatmanager->StopAttack(attacker);
  
!                         if ( !target->GetClient() || !target->GetActorPtr()->GetInvincibility() )
                          {
                              psserver->combatmanager->AttackSomeone(attacker,target,3);  // always "normal" attack by npc for now