Invis check precedes power check.

2023-09-02 15:25:19 -04:00
parent 3e1a79c248
commit 92666dca21
1 changed files with 6 additions and 6 deletions
@@ -323,17 +323,17 @@ public class MobAI {
                    return false;
            }

-            // Mobile has no powers defined.
-
-            if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() &&
-                    PowersManager.getPowersForRune(mob.contractUUID).isEmpty())
-                return false;
-
            if (!mob.canSee((PlayerCharacter) mob.getCombatTarget())) {
                mob.setCombatTarget(null);
                return false;
            }

+            // Mobile has no powers defined in mobbase or contract..
+
+            if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() &&
+                    mob.getContract() != null && PowersManager.getPowersForRune(mob.getContract().getObjectUUID()).isEmpty())
+                return false;
+
            if (mob.nextCastTime == 0)
                mob.nextCastTime = System.currentTimeMillis();