Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source
This commit is contained in:
Ovalord committed 2018-02-18 20:55:31 +01:00
2 parents 85743223b1 4b5dcbf74b
commit c9b5bf9534
203 files changed
+1608 -341
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/AI/SmartScripts/SmartAI.cpp
+3 -2
View File
@@ -901,7 +901,8 @@ void SmartAI::StopFollow(bool complete)
if (!complete)
return;
if (Player* player = ObjectAccessor::GetPlayer(*me, mFollowGuid))
Player* player = ObjectAccessor::GetPlayer(*me, mFollowGuid);
if (player)
{
if (!mFollowCreditType)
player->RewardPlayerAndGroupAtEvent(mFollowCredit, me);
@@ -911,7 +912,7 @@ void SmartAI::StopFollow(bool complete)
SetDespawnTime(5000);
StartDespawn();
GetScript()->ProcessEventsFor(SMART_EVENT_FOLLOW_COMPLETED);
GetScript()->ProcessEventsFor(SMART_EVENT_FOLLOW_COMPLETED, player);
}
void SmartAI::SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker)