Skip to content

Commit

Permalink
Merge pull request #23 from StarCoreSE/revert-22-patch-1
Browse files Browse the repository at this point in the history
Revert "First whack at painter marks not clearing properly"
  • Loading branch information
InvalidArgument3 authored Jul 25, 2024
2 parents 623d113 + 513dcd8 commit dec7b2f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Data/Scripts/CoreSystems/Ai/AiTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ internal void Sync(PaintedTargetPacket packet, Ai ai)

internal FakeWorldTargetInfo GetFakeTargetInfo(Ai ai)
{
var cleared = false;
if (TmpEntity != null && EntityId == TmpEntity.EntityId && TmpEntity.Physics != null && !TmpEntity.MarkedForClose && !TmpEntity.Closed)
{
if (Session.I.Tick != LastInfoTick)
Expand All @@ -274,17 +273,15 @@ internal FakeWorldTargetInfo GetFakeTargetInfo(Ai ai)
else if (Type == FakeType.Painted && EntityId != 0)
{
ClearMark(Session.I.Tick, MarkClearResons.PaintSwitchOrNoTargetInDb);
cleared = true;
}
}
}
else if (Type == FakeType.Painted && EntityId != 0)
{
ClearMark(Session.I.Tick, MarkClearResons.NoTarget);
cleared = true;
}

return cleared ? null : FakeInfo;
return FakeInfo;
}

internal enum MarkClearResons
Expand Down

0 comments on commit dec7b2f

Please sign in to comment.