From ed63c819bd350f558607763ecee4563478593c8f Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 20 Jan 2019 19:14:35 +1100 Subject: [PATCH 1/4] fix dead mobs following you around and beating you to death --- src/world/Actor/BNpc.cpp | 3 +++ 1 file changed, 3 insertions(+) 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: From 510d2296b8c6ca790469c243519f8726b45abf68 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 20 Jan 2019 19:16:12 +1100 Subject: [PATCH 2/4] add recastnavigation submodule --- .gitmodules | 3 +++ deps/recastnavigation | 1 + 2 files changed, 4 insertions(+) create mode 160000 deps/recastnavigation 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/deps/recastnavigation b/deps/recastnavigation new file mode 160000 index 00000000..14b26315 --- /dev/null +++ b/deps/recastnavigation @@ -0,0 +1 @@ +Subproject commit 14b2631527c4792e95b2c78ebfa8ac4cd3413363 From 96ee406a5ddf7801ed1b8583e48a18b0e035185d Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 20 Jan 2019 19:26:19 +1100 Subject: [PATCH 3/4] update recast submodule and include in project --- CMakeLists.txt | 1 + deps/recastnavigation | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 index 14b26315..d24db2de 160000 --- a/deps/recastnavigation +++ b/deps/recastnavigation @@ -1 +1 @@ -Subproject commit 14b2631527c4792e95b2c78ebfa8ac4cd3413363 +Subproject commit d24db2de131d6be5a1bc38067fa8b649544a0dd2 From 06408d54961550ae2a44a5fb94bc253e72027758 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 20 Jan 2019 20:07:32 +1100 Subject: [PATCH 4/4] link and include recast in pcb_reader --- src/tools/pcb_reader/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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/" )