Merge commit '73709e7c1334521189d8882ab1ba33fe259a12dc' into 4.3.4

Conflicts:
	sql/updates/world/2015_02_09_14_world.sql
This commit is contained in:
Carbenium
2015-07-21 21:59:41 +02:00

View File

@@ -207,7 +207,7 @@ public:
void DamageTaken(Unit* /*done_by*/, uint32 &damage) override
{
if (damage > me->GetHealth() && events.IsInPhase(PHASE_ONE))
if (damage >= me->GetHealth() && events.IsInPhase(PHASE_ONE))
{
damage = 0;
me->RemoveAllAuras();