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
@@ -1856,7 +1856,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
|
||||
if (sScriptMgr->OnGossipHello(player, gameObjTarget))
|
||||
return;
|
||||
|
||||
gameObjTarget->AI()->GossipHello(player);
|
||||
if (gameObjTarget->AI()->GossipHello(player))
|
||||
return;
|
||||
|
||||
switch (gameObjTarget->GetGoType())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user