diff options
| author | megamage <none@none> | 2009-01-09 16:43:23 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-09 16:43:23 -0600 |
| commit | 1ffb1cef3344206dfea149cb78146c30449d51c2 (patch) | |
| tree | 655ac591f6f5aaca3dc65d67f3940f589e2394db /src/game/TemporarySummon.cpp | |
| parent | 5c8f52d134899e10484dd47e91b612e2228842bf (diff) | |
| parent | 90a82a81ad5d20d5e7188d6e9d660280f0b1eab4 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/TemporarySummon.cpp')
| -rw-r--r-- | src/game/TemporarySummon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp index 357a32b4ecb..553f7644b64 100644 --- a/src/game/TemporarySummon.cpp +++ b/src/game/TemporarySummon.cpp @@ -172,9 +172,9 @@ void TemporarySummon::Summon(TempSummonType type, uint32 lifetime) void TemporarySummon::UnSummon() { - CombatStop(); + RemoveCharmedOrPossessedBy(NULL); - UnpossessSelf(false); + CombatStop(); CleanupsBeforeDelete(); AddObjectToRemoveList(); |