From: <wel...@us...> - 2010-02-14 06:27:25
|
Revision: 5541 http://planeshift.svn.sourceforge.net/planeshift/?rev=5541&view=rev Author: weltall2 Date: 2010-02-14 06:27:19 +0000 (Sun, 14 Feb 2010) Log Message: ----------- prevent crash on training when an npc is reloaded Modified Paths: -------------- trunk/src/server/progressionmanager.cpp Modified: trunk/src/server/progressionmanager.cpp =================================================================== --- trunk/src/server/progressionmanager.cpp 2010-02-13 19:35:29 UTC (rev 5540) +++ trunk/src/server/progressionmanager.cpp 2010-02-14 06:27:19 UTC (rev 5541) @@ -505,7 +505,7 @@ skills->setProgressionPoints(character->GetProgressionPoints()); - if (trainer) + if (trainer && trainer->GetActor()) { trainerInfo = trainer->GetTrainerInfo(); faction = trainer->GetActor()->GetRelativeFaction(character->GetActor()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |