Fixed: Possessed NPCs sometimes would not be where the client sees th…

…em, after unpossessing, because the AI sends monster move packet before the client gets the object creation update.
World0fWarcraft · Jul 9, 2023 · d1627e5 · d1627e5
1 parent c757034
commit d1627e5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/world/Game/Entities/Player.cpp b/src/world/Game/Entities/Player.cpp
@@ -13248,7 +13248,11 @@ void Player::bindSight( Object *target )
 		for( std::set< uint64 >::iterator itr = m_visibleObjects.begin(); itr != m_visibleObjects.end(); ++itr )
 		{
 			uint64 guid = *itr;
-			PushOutOfRange( guid );
+
+			if( guid != GetGUID() )
+			{
+				Messenger::SendDestroyObject( this, guid );
+			}
 		}
 		m_visibleObjects.clear();
 
@@ -13273,7 +13277,7 @@ void Player::bindSight( Object *target )
 			uint64 guid = *itr;
 			if( guid != target->GetGUID() )
 			{
-				PushOutOfRange( guid );
+				Messenger::SendDestroyObject( this, guid );
 			}
 		}
 
@@ -13286,7 +13290,7 @@ void Player::bindSight( Object *target )
 		for( std::set< Object* >::iterator itr = objects.begin(); itr != objects.end(); ++itr )
 		{
 			Object *object = (*itr);
-			if( CanSee( object ) )
+			if( ( object->GetGUID() != this->GetGUID() ) && CanSee( object ) )
 			{
 				createForPlayer( object );
 				AddVisibleObject( object->GetGUID() );
@@ -13295,4 +13299,6 @@ void Player::bindSight( Object *target )
 
 		target->setFarsightViewer( this );
 	}
+
+	ProcessPendingUpdates();
 }
diff --git a/src/world/Messenger.cpp b/src/world/Messenger.cpp
@@ -207,6 +207,15 @@ void Messenger::SendDestroyObject(Player *player, Object *object)
 	PlayerMessenger::sendMessage( player, data );
 }
 
+void Messenger::SendDestroyObject(Player *player, uint64 guid)
+{
+	WorldPacket data( SMSG_DESTROY_OBJECT, 9 );
+	data << uint64( guid );
+	data << uint8( 0 );
+
+	PlayerMessenger::sendMessage( player, data );
+}
+
 void Messenger::SendGameObjectCustomAnim( GameObject *go, uint32 anim, Player *player )
 {
 	WorldPacket  data(12);

diff --git a/src/world/Messenger.h b/src/world/Messenger.h
@@ -56,6 +56,9 @@ class SERVER_DECL Messenger
 	/// Destroys this Object for the player's client
 	static void SendDestroyObject( Player* player, Object* object );
 
+	/// Destroys this Object for the player's client
+	static void SendDestroyObject( Player* player, uint64 guid );
+
 	/// Sends a gameobject animation to the player
 	static void SendGameObjectCustomAnim( GameObject* go, uint32 anim, Player* player );