-
Notifications
You must be signed in to change notification settings - Fork 545
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes cmangos/mangos-wotlk#510
- Loading branch information
Showing
5 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21965,6 +21965,25 @@ void Player::SendLootError(ObjectGuid guid, LootError error) const | |
SendDirectMessage(data); | ||
} | ||
|
||
void Player::SetDeathPrevention(bool enable) | ||
{ | ||
if (enable) | ||
m_ExtraFlags |= PLAYER_EXTRA_GM_UNKILLABLE; | ||
else | ||
m_ExtraFlags &= ~PLAYER_EXTRA_GM_UNKILLABLE; | ||
} | ||
|
||
bool Player::IsPreventingDeath() const | ||
{ | ||
return m_ExtraFlags & PLAYER_EXTRA_GM_UNKILLABLE; | ||
} | ||
|
||
void Player::ResetDeathTimer() | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
insunaa
Author
Contributor
|
||
{ | ||
// 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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ah crap I messed up the cherry-pick
I think this has to go?