diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-29 22:29:06 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-29 22:29:06 +0100 |
| commit | 872c239dbe0a0a289ed72b3204986df2a612f546 (patch) | |
| tree | 7e6298edf370f4e0651723ee9ce5b0b9493fb7ce /src/server/game/Handlers/SpellHandler.cpp | |
| parent | 3d1f8fd29223bfa4d59bd2390722998311244b7c (diff) | |
| parent | e07a8db6da2a057ff5065df901efaa5c417bd9dc (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'src/server/game/Handlers/SpellHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/SpellHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 6aeb61b222b..de881e0608d 100755 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -562,8 +562,8 @@ void WorldSession::HandleTotemDestroyed(WorldPacket& recvPacket) return; Creature* totem = GetPlayer()->GetMap()->GetCreature(_player->m_SummonSlot[slotId]); - // Don't unsummon sentry totem - if (totem && totem->isTotem() && totem->GetEntry() != SENTRY_TOTEM_ENTRY) + + if (totem && totem->isTotem()) totem->ToTotem()->UnSummon(); } |