From d5bb3c847e46473e430b20dbcaf9f68cc3d93fcf Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 30 Jan 2019 23:48:09 +0100
Subject: [PATCH] Some more targetId fixes

---
 src/world/Actor/BNpc.cpp                          | 2 +-
 src/world/Actor/Chara.cpp                         | 2 +-
 src/world/Network/PacketWrappers/NpcSpawnPacket.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 77b97740..8395f549 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -549,7 +549,7 @@ void Sapphire::Entity::BNpc::onActionHostile( Sapphire::Entity::CharaPtr pSource
 
 void Sapphire::Entity::BNpc::onDeath()
 {
-  setTargetId( INVALID_GAME_OBJECT_ID );
+  setTargetId( INVALID_GAME_OBJECT_ID64 );
   m_currentStance = Stance::Passive;
   m_state = BNpcState::Dead;
   m_timeOfDeath = Util::getTimeSeconds();
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 8ba8311b..ad81acf6 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -37,7 +37,7 @@ using namespace Sapphire::Network::ActorControl;
 Sapphire::Entity::Chara::Chara( ObjKind type, FrameworkPtr pFw ) :
   Actor( type ),
   m_pose( 0 ),
-  m_targetId( INVALID_GAME_OBJECT_ID ),
+  m_targetId( INVALID_GAME_OBJECT_ID64 ),
   m_pFw( std::move( std::move( pFw ) ) )
 {
   // initialize the free slot queue
diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
index fe01c415..527e39ce 100644
--- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h
@@ -58,7 +58,7 @@ namespace Sapphire::Network::Packets::Server
 
       m_data.classJob = 0;
 
-      m_data.targetId = Common::INVALID_GAME_OBJECT_ID64;
+      m_data.targetId = bnpc.getTargetId();
       m_data.spawnerId = Common::INVALID_GAME_OBJECT_ID64;
       m_data.parentActorId = Common::INVALID_GAME_OBJECT_ID64;