Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
44c2edee51
66 files changed
+3235
-448
No files matched your search
@@ -325,7 +325,8 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
|
||||
if (!go->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
|
||||
return;
|
||||
|
||||
go->AI()->GossipHello(_player);
|
||||
if (go->AI()->GossipHello(_player))
|
||||
return;
|
||||
|
||||
_player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT, go->GetEntry());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user