diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-06-23 11:41:59 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-06-23 11:41:59 +0200 |
| commit | 37142deae41d443ed690dde6b7691d157e5e3694 (patch) | |
| tree | f97d607a9b2170a3de2cde79282cb61cc50ddd7b /src | |
| parent | 73384e56d48cd0495c4926f163e435d75660624f (diff) | |
| parent | 3eeb77a8f33444115e1d104831247bd4a96d6ff8 (diff) | |
Merge pull request #14937 from xerkoss/patch-2
Core/Spell: Fix shaman reincarnation
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3c0510cf3c5..01826da9fd0 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23656,8 +23656,8 @@ uint32 Player::GetResurrectionSpellId() } } - // Reincarnation (passive spell) // prio: 1 // Glyph of Renewed Life - if (prio < 1 && HasSpell(20608) && !GetSpellHistory()->HasCooldown(21169) && (HasAura(58059) || HasItemCount(17030))) + // Reincarnation (passive spell) // prio: 1 + if (prio < 1 && HasSpell(20608) && !GetSpellHistory()->HasCooldown(21169)) spell_id = 21169; return spell_id; |