diff --git a/.gitmodules b/.gitmodules
index 69f7a3a6..a7b40f34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "deps/spdlog"]
 	path = deps/spdlog
 	url = https://github.com/gabime/spdlog.git
+[submodule "deps/recastnavigation"]
+	path = deps/recastnavigation
+	url = https://github.com/SapphireServer/recastnavigation
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1e8b0d4..9623c60e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ add_subdirectory( "deps/zlib" )
 add_subdirectory( "deps/MySQL" )
 add_subdirectory( "deps/datReader" )
 add_subdirectory( "deps/mysqlConnector" )
+add_subdirectory( "deps/recastnavigation" )
 
 ##############################
 #  Main Sapphire Components  #
diff --git a/deps/recastnavigation b/deps/recastnavigation
new file mode 160000
index 00000000..d24db2de
--- /dev/null
+++ b/deps/recastnavigation
@@ -0,0 +1 @@
+Subproject commit d24db2de131d6be5a1bc38067fa8b649544a0dd2
diff --git a/src/tools/pcb_reader/CMakeLists.txt b/src/tools/pcb_reader/CMakeLists.txt
index 0a51293b..96b4af4e 100644
--- a/src/tools/pcb_reader/CMakeLists.txt
+++ b/src/tools/pcb_reader/CMakeLists.txt
@@ -8,9 +8,12 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
 
 if (UNIX)
-    target_link_libraries (pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs )
+    target_link_libraries( pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs Recast Detour )
 else()
-    target_link_libraries (pcb_reader2 common xivdat mysql zlib)
+    target_link_libraries( pcb_reader2 common xivdat mysql zlib Recast Detour )
 endif()
 
+target_include_directories( pcb_reader2
+        PUBLIC
+            "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/" )
 
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index b8966bf4..86b5f402 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -301,6 +301,9 @@ void Sapphire::Entity::BNpc::update( int64_t currTime )
   const uint8_t aggroRange = 8;
   const uint8_t maxDistanceToOrigin = 30;
 
+  if( m_status == ActorStatus::Dead )
+    return;
+
   switch( m_state )
   {
     case BNpcState::Retreat: