Working on hostile NPCs, fixing darklands mode for battle zone

src/CharacterState.cpp

@@ -66,7 +66,9 @@ void CharacterState::setTarget(
 
     requestedWalkTarget = normalizedTarget;
     onArrivedCallbackName = std::move(callbackName);
-    pathWaypoints = location.planPathExceptMyself(position, normalizedTarget, entityId);
+    pathWaypoints = location.navigationMaps.empty()
+        ? std::vector<Eigen::Vector3f>{}
+        : location.planPathExceptMyself(position, normalizedTarget, entityId);
     currentWaypointIndex = 0;
     if (!pathWaypoints.empty()) {
         for (Eigen::Vector3f& waypoint : pathWaypoints) waypoint.y() = 0.f;
@@ -83,7 +85,9 @@ void CharacterState::forceReplan(
 {
     const Eigen::Vector3f normalizedTarget(
         requestedWalkTarget.x(), 0.f, requestedWalkTarget.z());
-    pathWaypoints = location.planPathExceptMyself(position, normalizedTarget, entityId);
+    pathWaypoints = location.navigationMaps.empty()
+        ? std::vector<Eigen::Vector3f>{}
+        : location.planPathExceptMyself(position, normalizedTarget, entityId);
     currentWaypointIndex = 0;
     if (!pathWaypoints.empty()) {
         for (Eigen::Vector3f& waypoint : pathWaypoints) waypoint.y() = 0.f;
@@ -146,15 +150,15 @@ CharacterUpdateEvents CharacterState::update(
 
     const CharacterObservation* attackTarget = context.attackTarget;
     const CharacterObservation* faceTarget = context.faceTarget;
-    if (!attackTarget) {
+    if (!attackTarget || attackTarget->hp <= 0.f) {
         battle_state = 0;
         attack = 0;
         attackTargetId.clear();
     } else {
         const float distance = (attackTarget->position - position).norm();
         if (distance >= visibleRange) {
-            if (isPlayer &&
-                (attackTarget->position - requestedWalkTarget).norm() > TARGET_REPLAN_THRESHOLD) {
+            if ((attackTarget->position - requestedWalkTarget).norm() >
+                TARGET_REPLAN_THRESHOLD) {
                 events.navigationRequested = true;
                 events.navigationTarget = attackTarget->position;
             }