diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 11:33:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 11:33:40 +0200 |
| commit | 40a29a3c99412b18b96341cefefb76bd9407531a (patch) | |
| tree | 8986232cdc234d6409f3a9ab591ce50a62812dfe /src/server/scripts/Outland/TempestKeep | |
| parent | aa6ae2773f439ec5b41509e591f723163ca2bb0b (diff) | |
| parent | fb6365ac689419a2e5dd758d4bf70c1a20ff41ff (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
Diffstat (limited to 'src/server/scripts/Outland/TempestKeep')
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 500bcd1ed8f..78a7d71732a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -93,7 +93,7 @@ class npc_warp_splinter_treant : public CreatureScript void UpdateAI(uint32 diff) OVERRIDE { - if (!UpdateVictim()) + if (!UpdateVictim() || !me->GetVictim()) { if (WarpGuid && check_Timer <= diff) { @@ -115,7 +115,7 @@ class npc_warp_splinter_treant : public CreatureScript return; } - if (me->EnsureVictim()->GetGUID() != WarpGuid) + if (me->EnsureVictim()->GetGUID() != WarpGuid) DoMeleeAttackIfReady(); } }; |