diff options
| author | QAston <none@none> | 2009-03-04 00:29:50 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-04 00:29:50 +0100 |
| commit | d6b09015d6c1ac5c62e63d51aeb496c0cc2d3fe5 (patch) | |
| tree | 183a759c6540c040174449502c0ce7552a6f5484 /src/game/ObjectAccessor.cpp | |
| parent | 454f882cf238506bc12f593de71e97cd27e961e8 (diff) | |
| parent | c113bf884f9523745f22aae78cde80903b2ba192 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectAccessor.cpp')
| -rw-r--r-- | src/game/ObjectAccessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index e832aec0c57..af365f51517 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -86,7 +86,7 @@ ObjectAccessor::GetNPCIfCanInteractWith(Player const &player, uint64 guid, uint3 if(factionTemplate) { FactionEntry const* faction = sFactionStore.LookupEntry(factionTemplate->faction); - if( faction->reputationListID >= 0 && player.GetReputationRank(faction) <= REP_UNFRIENDLY) + if( faction && faction->reputationListID >= 0 && player.GetReputationRank(faction) <= REP_UNFRIENDLY) return NULL; } |