aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 30abd5c3ada..9cc44940829 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1815,9 +1815,6 @@ void Player::setDeathState(DeathState s)
clearResurrectRequestData();
- // remove form before other mods to prevent incorrect stats calculation
- RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
-
//FIXME: is pet dismissed at dying or releasing spirit? if second, add setDeathState(DEAD) to HandleRepopRequestOpcode and define pet unsummon here with (s == DEAD)
RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true);
@@ -1842,14 +1839,8 @@ void Player::setDeathState(DeathState s)
SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
if (isAlive() && !cur)
- {
//clear aura case after resurrection by another way (spells will be applied before next death)
SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
-
- // restore default warrior stance
- if (getClass() == CLASS_WARRIOR)
- CastSpell(this, 2457, true);
- }
}
bool Player::BuildEnumData(QueryResult result, WorldPacket* data)
@@ -17144,9 +17135,6 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff)
}
while (result->NextRow());
}
-
- if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
- CastSpell(this, 2457, true);
}
void Player::_LoadGlyphAuras()