2 files changed, 3 insertions, 7 deletions
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 9c82497b15d..9f4d20358da 100755
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -67,7 +67,7 @@ const char GlyphSlotfmt[]="nii";
 
 const char GtBarberShopCostBasefmt[]="xf";
 const char GtCombatRatingsfmt[]="xf";
-const char GtOCTHpPerStaminafmt[]="xf";
+const char GtOCTHpPerStaminafmt[]="df";
 const char GtChanceToMeleeCritBasefmt[]="xf";
 const char GtChanceToMeleeCritfmt[]="xf";
 const char GtChanceToSpellCritBasefmt[]="xf";
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index d44feeecd08..bee6ae39a35 100755
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -225,12 +225,8 @@ void Player::UpdateArmor()
 
 float Player::GetHealthBonusFromStamina()
 {
-    float stamina = GetStat(STAT_STAMINA);
-
-    float baseStam = stamina < 20 ? stamina : 20;
-    float moreStam = stamina - baseStam;
-
-    return baseStam + (moreStam*10.0f);
+    gtOCTHpPerStaminaEntry const* hpBase = sGtOCTHpPerStaminaStore.LookupEntry((getClass() - 1) * GT_MAX_LEVEL + getLevel() - 1);
+    return GetStat(STAT_STAMINA) * hpBase->ratio;
 }
 
 float Player::GetManaBonusFromIntellect()