From 660e22faeb623de904a8c7845d0850b3d020958d Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 17 Mar 2011 09:42:33 +0100 Subject: Core/Corpses: Fixed loading phaseMask if its greater than 255 --- src/server/game/Entities/Corpse/Corpse.cpp | 2 +- src/server/game/Entities/Unit/StatSystem.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 030893c8219..48c7448e32c 100755 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -190,7 +190,7 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields) m_isWorldObject = true; uint32 instanceid = fields[14].GetUInt32(); - uint32 phaseMask = fields[15].GetUInt8(); + uint32 phaseMask = fields[15].GetUInt16(); // place SetLocationInstanceId(instanceid); diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 6a574e5489c..91be2af73b9 100755 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -1095,9 +1095,9 @@ void Guardian::UpdateMaxHealth() } float value = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth(); - value *= GetModifierValue(unitMod, BASE_PCT); - value += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * multiplicator; - value *= GetModifierValue(unitMod, TOTAL_PCT); + value *= GetModifierValue(unitMod, BASE_PCT); + value += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * multiplicator; + value *= GetModifierValue(unitMod, TOTAL_PCT); SetMaxHealth((uint32)value); } -- cgit v1.2.3