Core/Spells: Fix warrior stances save after death/logout
This commit is contained in:
@@ -1815,9 +1815,6 @@ void Player::setDeathState(DeathState s)
|
|||||||
|
|
||||||
clearResurrectRequestData();
|
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)
|
//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);
|
RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true);
|
||||||
|
|
||||||
@@ -1842,14 +1839,8 @@ void Player::setDeathState(DeathState s)
|
|||||||
SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
|
SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
|
||||||
|
|
||||||
if (isAlive() && !cur)
|
if (isAlive() && !cur)
|
||||||
{
|
|
||||||
//clear aura case after resurrection by another way (spells will be applied before next death)
|
//clear aura case after resurrection by another way (spells will be applied before next death)
|
||||||
SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
|
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)
|
bool Player::BuildEnumData(QueryResult result, WorldPacket* data)
|
||||||
@@ -17144,9 +17135,6 @@ void Player::_LoadAuras(PreparedQueryResult result, uint32 timediff)
|
|||||||
}
|
}
|
||||||
while (result->NextRow());
|
while (result->NextRow());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
|
|
||||||
CastSpell(this, 2457, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::_LoadGlyphAuras()
|
void Player::_LoadGlyphAuras()
|
||||||
|
|||||||
Reference in New Issue
Block a user