Skip to content

Commit c2e1798

Browse files
authored
Merge pull request #832 from FFXIV-CombatReborn/occulthotifx
Occult Crescent mob hotfix
2 parents aa80be9 + 7dc2cd6 commit c2e1798

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

RotationSolver.Basic/Helpers/ObjectHelper.cs

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using ECommons.GameHelpers;
1010
using ECommons.Logging;
1111
using ExCSS;
12+
using FFXIVClientStructs;
1213
using FFXIVClientStructs.FFXIV.Client.Game;
1314
using FFXIVClientStructs.FFXIV.Client.Game.Event;
1415
using FFXIVClientStructs.FFXIV.Client.Graphics;
@@ -188,26 +189,26 @@ internal static bool IsAttackable(this IBattleChara battleChara)
188189
}
189190
}
190191

191-
if (DataCenter.IsInOccultCrescentOp)
192-
{
193-
bool isInCE = Player.Object.GetEventType() == EventHandlerContent.PublicContentDirector;
192+
//if (DataCenter.IsInOccultCrescentOp)
193+
//{
194+
// //bool isInCE = this needs to be fixed to sort out indiicator for in CE or not
194195

195-
if (isInCE)
196-
{
197-
if (!battleChara.IsOccultCEMob())
198-
{
199-
return false;
200-
}
201-
}
196+
// if (isInCE)
197+
// {
198+
// if (!battleChara.IsOccultCEMob())
199+
// {
200+
// return false;
201+
// }
202+
// }
202203

203-
if (!isInCE)
204-
{
205-
if (battleChara.IsOccultCEMob())
206-
{
207-
return false;
208-
}
209-
}
210-
}
204+
// if (!isInCE)
205+
// {
206+
// if (battleChara.IsOccultCEMob())
207+
// {
208+
// return false;
209+
// }
210+
// }
211+
//}
211212

212213
if (Service.Config.TargetQuestThings && battleChara.IsOthersPlayersMob())
213214
{
@@ -297,7 +298,7 @@ internal static bool IsOccultFateMob(this IBattleChara battleChara)
297298
return false;
298299
}
299300

300-
if (battleChara.IsEnemy() == false)
301+
if (!battleChara.IsEnemy())
301302
{
302303
return false;
303304
}

0 commit comments

Comments
 (0)