Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mmaps

Browse Source 
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
This commit is contained in:
Nay
2012-10-07 14:51:21 +01:00
parent 509c8d0bae 1a89de87c1
commit 972b418103
58 changed files with 2762 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Spells/SpellEffects.cpp
View File

@@ -2002,7 +2002,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())
{