diff options
Diffstat (limited to 'src/game/ObjectAccessor.cpp')
| -rw-r--r-- | src/game/ObjectAccessor.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index c245b09f410..14ee90ef3e5 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -81,13 +81,11 @@ ObjectAccessor::GetNPCIfCanInteractWith(Player const &player, uint64 guid, uint3 return NULL; // not unfriendly - FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(unit->getFaction()); - if(factionTemplate) - { - FactionEntry const* faction = sFactionStore.LookupEntry(factionTemplate->faction); - if( faction && faction->reputationListID >= 0 && player.GetReputationRank(faction) <= REP_UNFRIENDLY) - return NULL; - } + if(FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(unit->getFaction())) + if(factionTemplate->faction) + if(FactionEntry const* faction = sFactionStore.LookupEntry(factionTemplate->faction)) + if(faction->reputationListID >= 0 && player.GetReputationRank(faction) <= REP_UNFRIENDLY) + return NULL; // not too far if(!unit->IsWithinDistInMap(&player,INTERACTION_DISTANCE)) |