stop processing npc actions if marked for kick

Author: AmyrAhmady

Server/Components/NPCs/NPC/npc.cpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #include "npc.hpp"
@@ -33,6 +33,7 @@ NPC::NPC(NPCComponent* component, IPlayer* playerPtr)
 	, specialAction_(SpecialAction_None)
 	, invulnerable_(false)
 	, spawning_(false)
+	, markedForKick_(false)
 	, meleeAttacking_(false)
 	, meleeAttackDelay_(0)
 	, meleeSecondaryAttack_(false)
@@ -2574,7 +2575,7 @@ int NPC::getCurrentPathPointIndex() const
 
 void NPC::tick(Microseconds elapsed, TimePoint now)
 {
-	if (player_)
+	if (player_ && !markedForKick_)
 	{
 		auto state = player_->getState();
 
@@ -2798,7 +2799,7 @@ void NPC::tick(Microseconds elapsed, TimePoint now)
 
 										// Check shooting again because NPC::shoot actually calls events and people may use stopAim in them.
 										// Therefore we are already in shooting_ == true scope, but it's not true anymore, so we don't want to
-										// Be stuck with the wrong applied keys. But let it do the rest, let it reduce ammo count and do reload checks. 
+										// Be stuck with the wrong applied keys. But let it do the rest, let it reduce ammo count and do reload checks.
 										if (shooting_)
 										{
 											applyKey(Key::AIM);

Server/Components/NPCs/NPC/npc.hpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #pragma once
@@ -371,6 +371,11 @@ class NPC : public INPC, public PoolIDProvider, public NoCopy
 		return vehicle_ && vehicleSeat_ != SEAT_NONE;
 	}
 
+	inline void setKickMarkState(bool state)
+	{
+		markedForKick_ = true;
+	}
+
 private:
 	// The NPC's player pointer.
 	IPlayer* player_;
@@ -403,6 +408,7 @@ class NPC : public INPC, public PoolIDProvider, public NoCopy
 	bool invulnerable_;
 	PlayerSurfingData surfingData_;
 	bool spawning_;
+	bool markedForKick_;
 
 	// Attack data
 	bool meleeAttacking_;

Server/Components/NPCs/Network/npcs_network.hpp

@@ -10,6 +10,7 @@
 #include <sdk.hpp>
 #include <Server/Components/NPCs/npcs.hpp>
 #include <Impl/network_impl.hpp>
+#include "../NPC/npc.hpp"
 
 using namespace Impl;
 
@@ -77,6 +78,7 @@ class NPCNetwork : public Impl::Network
 		auto npc = npcComponent->get(id);
 		if (npc)
 		{
+			reinterpret_cast<NPC*>(npc)->setKickMarkState(true);
 			markedToBeKicked.push_back(npc->getID());
 		}
 	}

Server/Components/NPCs/Node/node.cpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #include "node.hpp"

Server/Components/NPCs/Node/node.hpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #pragma once

Server/Components/NPCs/Node/node_manager.cpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #include "node_manager.hpp"

Server/Components/NPCs/Node/node_manager.hpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #pragma once

Server/Components/NPCs/Path/path.cpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #include "path.hpp"

Server/Components/NPCs/Path/path.hpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #pragma once

Server/Components/NPCs/Path/path_pool.cpp

@@ -3,7 +3,7 @@
  *  v. 2.0. If a copy of the MPL was not distributed with this file, You can
  *  obtain one at http://mozilla.org/MPL/2.0/.
  *
- *  The original code is copyright (c) 2022, open.mp team and contributors.
+ *  The original code is copyright (c) 2025, open.mp team and contributors.
  */
 
 #include "path_pool.hpp"