cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

missed a file from previous commit

Browse Source
This commit is contained in:
Tahir Akhlaq
2017-08-24 05:36:12 +01:00
parent 9bb298b2f3
commit 5e2487c8cc
2 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs
View File

@@ -44,34 +44,36 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
return true;
}
*/
if (owner.target == null || target.IsDead())
if (target == null || target.IsDead())
{
return true;
}
if (owner.target.actorId != owner.currentLockedTarget)
owner.aiContainer.ChangeTarget(Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
if (IsAttackReady())
else
{
if (CanAttack())
{
TryInterrupt();
if (owner.target != target || owner.target.actorId != owner.currentLockedTarget)
owner.aiContainer.ChangeTarget(target = Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
// todo: check weapon delay/haste etc and use that
if (!interrupt)
if (IsAttackReady())
{
if (CanAttack())
{
OnComplete();
TryInterrupt();
// todo: check weapon delay/haste etc and use that
if (!interrupt)
{
OnComplete();
}
else
{
}
SetInterrupted(false);
}
else
{
// todo: handle interrupt/paralyze etc
}
SetInterrupted(false);
}
else
{
// todo: handle interrupt/paralyze etc
}
}
return false;