aboutsummaryrefslogtreecommitdiff
path: root/src/game/TemporarySummon.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-16 19:04:31 -0600
committermegamage <none@none>2009-02-16 19:04:31 -0600
commit00ba699d6f391623db188cdcf183262369d38f31 (patch)
tree5fdc1441dc3f71a5de985c9c176e32aa51c7cdc4 /src/game/TemporarySummon.cpp
parent91e640d14e2332f0e1fc47780fc6278c02e47ee6 (diff)
parent5ded6c8df4920acbc14b6b21dd2d68a54e99011a (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/TemporarySummon.cpp')
-rw-r--r--src/game/TemporarySummon.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index 788fe4d2b7d..1214ed1bd84 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -172,10 +172,6 @@ void TemporarySummon::Summon(TempSummonType type, uint32 lifetime)
void TemporarySummon::UnSummon()
{
- RemoveCharmedOrPossessedBy(NULL);
-
- CombatStop();
-
CleanupsBeforeDelete();
AddObjectToRemoveList();