fix kicking NPCs crashing in certain situations

Author: AmyrAhmady

Server/Source/player.cpp

@@ -361,6 +361,21 @@ void Player::streamOutForPlayer(IPlayer& other)
 	}
 }
 
+void Player::kick()
+{
+	if (pool_.npcsComponent_ && pool_.npcsComponent_->get(poolID))
+	{
+		// Don't set kick status to true if they're our native NPCs, so we can handle it in NPC component instead.
+		kicked_ = false;
+	}
+	else
+	{
+		kicked_ = true;
+	}
+
+	netData_.network->disconnect(*this);
+}
+
 void Player::ban(StringView reason)
 {
 	PeerAddress::AddressString address;

Server/Source/player_impl.hpp

@@ -276,6 +276,8 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 
 	void ban(StringView reason) override;
 
+	void kick() override;
+
 	void spawn() override
 	{
 		// Remove from vehicle.
@@ -920,12 +922,6 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
 		return fightingStyle_;
 	}
 
-	void kick() override
-	{
-		kicked_ = true;
-		netData_.network->disconnect(*this);
-	}
-
 	void setSkillLevel(PlayerWeaponSkill skill, int level) override
 	{
 		if (skill != PlayerWeaponSkill_Invalid && skill < skillLevels_.size())

Server/Source/player_pool.hpp

@@ -10,6 +10,7 @@
 
 #include "player_impl.hpp"
 #include <Server/Components/Console/console.hpp>
+#include <Server/Components/NPCs/npcs.hpp>
 #include <utils.hpp>
 
 struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public PlayerUpdateEventHandler, public CoreEventHandler
@@ -35,6 +36,7 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 	IFixesComponent* fixesComponent = nullptr;
 	ICustomModelsComponent* modelsComponent = nullptr;
 	IFixesComponent* fixesComponent_ = nullptr;
+	INPCComponent* npcsComponent_ = nullptr;
 	StreamConfigHelper streamConfigHelper;
 	int* markersShow;
 	int* markersUpdateRate;
@@ -2080,6 +2082,7 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 		actorsComponent = components.queryComponent<IActorsComponent>();
 		modelsComponent = components.queryComponent<ICustomModelsComponent>();
 		fixesComponent = components.queryComponent<IFixesComponent>();
+		npcsComponent_ = components.queryComponent<INPCComponent>();
 	}
 
 	bool onPlayerUpdate(IPlayer& p, TimePoint now) override