* merge
--HG-- branch : trunk
This commit is contained in:
@@ -7414,7 +7414,19 @@ void Spell::EffectWMODamage(uint32 /*i*/)
|
|||||||
goft = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION));
|
goft = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION));
|
||||||
// Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls)
|
// Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls)
|
||||||
if (casterft && goft && !casterft->IsFriendlyTo(*goft))
|
if (casterft && goft && !casterft->IsFriendlyTo(*goft))
|
||||||
gameObjTarget->TakenDamage((uint32)damage, caster);
|
{
|
||||||
|
gameObjTarget->TakenDamage(uint32(damage), caster);
|
||||||
|
WorldPacket data(SMSG_DESTRUCTIBLE_BUILDING_DAMAGE, 8+8+8+4+4);
|
||||||
|
data.append(gameObjTarget->GetPackGUID());
|
||||||
|
data.append(caster->GetPackGUID());
|
||||||
|
if (Unit *who = caster->GetCharmerOrOwner())
|
||||||
|
data.append(who->GetPackGUID());
|
||||||
|
else
|
||||||
|
data << uint8(0);
|
||||||
|
data << uint32(damage);
|
||||||
|
data << uint32(m_spellInfo->Id);
|
||||||
|
gameObjTarget->SendMessageToSet(&data, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user