Skip to content

Commit

Permalink
Fix failed cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
insunaa committed Apr 15, 2024
1 parent 53a3801 commit e03f672
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/game/Entities/Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21978,12 +21978,6 @@ bool Player::IsPreventingDeath() const
return m_ExtraFlags & PLAYER_EXTRA_GM_UNKILLABLE;
}

void Player::ResetDeathTimer()
{
// 6 minutes until repop at graveyard
m_deathTimer = 6 * MINUTE * IN_MILLISECONDS;
}

void Player::AddGCD(SpellEntry const& spellEntry, uint32 /*forcedDuration = 0*/, bool updateClient /*= false*/)
{
int32 gcdDuration = spellEntry.StartRecoveryTime;
Expand Down

0 comments on commit e03f672

Please sign in to comment.