src/MobAI.cpp

@@ -478,14 +478,6 @@ void MobAI::deadStep(CombatNPC* npc, time_t currTime) {
     if (self->groupLeader == self->id)
         roamingStep(self, currTime);
 
-    /*
-     * If the mob hasn't fully despanwed yet, don't try to respawn it. This protects
-     * against the edge case where mobs with a very short regenTime would try to respawn
-     * before they've faded away; and would respawn even if they were meant to be removed.
-     */
-    if (!self->despawned)
-        return;
-
     if (self->killedTime != 0 && currTime - self->killedTime < self->regenTime * 100)
         return;
 

src/Transport.cpp

@@ -388,21 +388,8 @@ NPCPath* Transport::findApplicablePath(int32_t id, int32_t type, int taskID) {
 
 void Transport::constructPathNPC(int32_t id, NPCPath* path) {
     BaseNPC* npc = NPCManager::NPCs[id];
-
+    if (npc->kind == EntityKind::MOB)
-    if (npc->kind == EntityKind::MOB) {
+        ((Mob*)(npc))->staticPath = true;
-        auto mob = (Mob*)npc;
-        mob->staticPath = true;
-
-        Vec3 firstPoint = path->points.front();
-
-        // Ensure that the first point coincides with the mob's spawn point.
-        if (mob->spawnX != firstPoint.x || mob->spawnY != firstPoint.y) {
-            std::cout << "[FATAL] The first point of the route for mob " << mob->id << " (type " << mob->type
-                << ") does not correspond with its spawn point." << std::endl;
-            exit(1);
-        }
-    }
-
     npc->loopingPath = path->isLoop;
 
     // Interpolate