From 37d94053df42a9fe894afffae5b372b43704e4cc Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sun, 7 Jun 2009 11:50:34 +0200
Subject: *Fix Glyph of Renewed Life. *Update formula for Death strike healing
 amount.

--HG--
branch : trunk
---
 src/game/Player.cpp | 4 ++--
 src/game/Unit.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index eba21fa5f99..b2689f6572c 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -19388,8 +19388,8 @@ uint32 Player::GetResurrectionSpellId()
         }
     }
 
-    // Reincarnation (passive spell)                        // prio: 1
-    if(prio < 1 && HasSpell(20608) && !HasSpellCooldown(21169) && HasItemCount(17030,1))
+    // Reincarnation (passive spell)  // prio: 1                  // Glyph of Renewed Life
+    if(prio < 1 && HasSpell(20608) && !HasSpellCooldown(21169) && (HasAura(58059) || HasItemCount(17030,1)))
         spell_id = 21169;
 
     return spell_id;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c2d6f77acec..b9ba6dbe2c5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6659,7 +6659,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             // Death Strike healing effect
             if (dummySpell->Id == 45469)
             {
-                int32 heal=0.5f * pVictim->GetDiseasesByCaster(GetGUID()) * damage+damage;
+                int32 heal=pVictim->GetDiseasesByCaster(GetGUID()) * GetMaxHealth()* 5 /100;
                 CastCustomSpell(this,45470,&heal,NULL,NULL,true);
                 return true;
             }
-- 
cgit v1.2.3