Core/Misc: Also remove buffs from pet when joining arena to make sure a player won't enter with a prebuffed pet, fixes issue 4287

--HG-- branch : trunk
2010-10-16 17:34:21 +03:00
parent 8154f7243c
commit 222d1cd211
2 changed files with 6 additions and 2 deletions
@@ -1981,9 +1981,14 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                    LeaveBattleground(false);                   // don't teleport to entry point
            }

-            // remove arena spell coldowns now to also remove pet's cooldowns before it's temporarily unsummoned
+            // remove arena spell coldowns/buffs now to also remove pet's cooldowns before it's temporarily unsummoned
            if (mEntry->IsBattleArena())
+            {
                RemoveArenaSpellCooldowns(true);
+                RemoveArenaAuras();
+                if (pet)
+                    pet->RemoveArenaAuras();
+            }

            // remove pet on map change
            if (pet)