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

fixed auto attacking self/npcs

Browse Source
This commit is contained in:
Tahir Akhlaq
2017-08-24 16:36:56 +01:00
parent 5e2487c8cc
commit 88abd59ec3
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FFXIVClassic Map Server/actors/chara/ai/TargetFind.cs
View File

@@ -89,7 +89,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
{
this.target = null;
this.findType = TargetFindCharacterType.None;
this.validTarget = ValidTarget.None;
this.validTarget = ValidTarget.Enemy;
this.aoeType = TargetFindAOEType.None;
this.targetPosition = null;
this.extents = 0.0f;
@@ -325,13 +325,23 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
if ((validTarget & ValidTarget.Corpse) == 0 && target.IsDead())
return false;
bool targetingPlayer = target is Player;
bool targetingPlayer = target.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER;
if ((validTarget & ValidTarget.Ally) != 0 && target.currentSubState != owner.currentSubState)
return false;
if ((validTarget & ValidTarget.Enemy) != 0 && target.currentSubState != (owner.currentSubState == SetActorStatePacket.SUB_STATE_MONSTER ?
SetActorStatePacket.SUB_STATE_PLAYER : SetActorStatePacket.SUB_STATE_MONSTER))
return false;
if ((validTarget & ValidTarget.NPC) != 0 && target.currentSubState != SetActorStatePacket.SUB_STATE_NONE)
return false;
// todo: why is player always zoning?
// cant target if zoning
if (targetingPlayer && ((Player)target).playerSession.isUpdatesLocked)
{
owner.Disengage();
owner.aiContainer.ChangeTarget(null);
return false;
}