From e7ad1da1dca995c1717ba19e5b68a1dd528fe023 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Thu, 31 Jan 2019 23:55:55 +1100
Subject: [PATCH] fix npcs not facing target after being pushed

---
 src/world/Actor/BNpc.cpp | 5 +++--
 src/world/Actor/BNpc.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 97dd4db9..145bd6f8 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -222,7 +222,7 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 {
   // do this first, this will update local actor position and the position of other actors
   // and then this npc will then path from the position after pushing/being pushed
-  pushNearbyBNpcs();
+  pushNearbyBNpcs( pos );
 
   if( Util::distance( getPos(), pos ) <= m_naviTargetReachedDistance )
   {
@@ -629,7 +629,7 @@ void Sapphire::Entity::BNpc::checkAggro()
   }
 }
 
-void Sapphire::Entity::BNpc::pushNearbyBNpcs()
+void Sapphire::Entity::BNpc::pushNearbyBNpcs( const Common::FFXIVARR_POSITION3& pos )
 {
   for( auto& bNpc : m_inRangeBNpc )
   {
@@ -651,6 +651,7 @@ void Sapphire::Entity::BNpc::pushNearbyBNpcs()
     auto x = ( cosf( angle ) );
     auto z = ( sinf( angle ) );
 
+    bNpc->face( pos );
     bNpc->setPos( pos.x + ( x * factor * delta ),
                   pos.y,
                   pos.z + ( z * factor * delta ) );
diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index 429203ec..d13f7eea 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -98,7 +98,7 @@ namespace Sapphire::Entity
 
     void checkAggro();
 
-    void pushNearbyBNpcs();
+    void pushNearbyBNpcs( const Common::FFXIVARR_POSITION3& pos );
 
   private:
     uint32_t m_bNpcBaseId;