[Planeshift-cvs] CVS: planeshift/src/server progressionmanager.cpp,1.203,1.204

[Arianna B. <ar...@us...>]

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

Modified Files:
	progressionmanager.cpp 
Log Message:
Fix for server crash

Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** progressionmanager.cpp	23 Feb 2006 05:28:47 -0000	1.203
--- progressionmanager.cpp	1 Mar 2006 18:27:50 -0000	1.204
***************
*** 1749,1753 ****
          }
  
!         if (!actor->GetClientID())
          {
              CPrintf(CON_ERROR, "Error: ProgressionEvent(%s) CreateNPCOp needs a valid client\n",eventName->GetData());
--- 1749,1753 ----
          }
  
!         if ( !actor->GetClientID() || !actor->GetClient() )
          {
              CPrintf(CON_ERROR, "Error: ProgressionEvent(%s) CreateNPCOp needs a valid client\n",eventName->GetData());
***************
*** 1781,1785 ****
              //    familiarid = familiardata->GetCharacterID();
              //}
! 
              gemNPC *Familiar = em->CreateFamiliar( actor->GetClient(), familiarid );
              if ( Familiar == NULL ) 
--- 1781,1785 ----
              //    familiarid = familiardata->GetCharacterID();
              //}
!         
              gemNPC *Familiar = em->CreateFamiliar( actor->GetClient(), familiarid );
              if ( Familiar == NULL ) 
***************
*** 1795,1798 ****
--- 1795,1799 ----
  
              return true;
+       
          }
          else