diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:26:27 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:26:27 +0100 |
| commit | 736093e91b2efee9cb7df37d32fd6705018a6eb5 (patch) | |
| tree | d76ca2cf1b4f5a65bf460ddeadebc7634da264af /src/server/game/AI | |
| parent | 2ded11354de44d6dd7ce6bd222ac188f8fbc3c9c (diff) | |
| parent | 06d42afba09c7048ed42f3e1d923a2a5b6dca93c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
Diffstat (limited to 'src/server/game/AI')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 6af09f3bb2b..0f11f407e0f 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -394,6 +394,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u (*itr)->ToCreature()->SetReactState(ReactStates(e.action.react.state)); } + delete targets; break; } case SMART_ACTION_RANDOM_EMOTE: @@ -1059,6 +1060,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u (*itr)->ToCreature()->DespawnOrUnsummon(e.action.forceDespawn.delay); } + delete targets; break; } case SMART_ACTION_SET_INGAME_PHASE_MASK: @@ -1076,6 +1078,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u (*itr)->ToGameObject()->SetPhaseMask(e.action.ingamePhaseMask.mask, true); } + delete targets; break; } case SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL: @@ -1120,6 +1123,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u ai->SetInvincibilityHpLevel(me->CountPctFromMaxHealth(e.action.invincHP.percent)); else ai->SetInvincibilityHpLevel(e.action.invincHP.minHP); + break; } case SMART_ACTION_SET_DATA: |