mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-05-20 08:26:59 -04:00
Merging
This commit is contained in:
@@ -76,20 +76,23 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
|
||||
return damage;
|
||||
}
|
||||
|
||||
public static void DamageTarget(Character attacker, Character defender, BattleAction action)
|
||||
public static void DamageTarget(Character attacker, Character defender, BattleAction action, DamageTakenType type)
|
||||
{
|
||||
if (defender != null)
|
||||
{
|
||||
// todo: other stuff too
|
||||
if (defender is BattleNpc)
|
||||
{
|
||||
if (!((BattleNpc)defender).hateContainer.HasHateForTarget(attacker))
|
||||
var bnpc = defender as BattleNpc;
|
||||
if (!bnpc.hateContainer.HasHateForTarget(attacker))
|
||||
{
|
||||
((BattleNpc)defender).hateContainer.AddBaseHate(attacker);
|
||||
bnpc.hateContainer.AddBaseHate(attacker);
|
||||
}
|
||||
((BattleNpc)defender).hateContainer.UpdateHate(attacker, action.amount);
|
||||
bnpc.hateContainer.UpdateHate(attacker, action.amount);
|
||||
bnpc.lastAttacker = attacker;
|
||||
}
|
||||
defender.DelHP((short)action.amount);
|
||||
defender.OnDamageTaken(attacker, action, type);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user