Merge branch 'openmultiplayer:master' into patch-1

Author: NexiusTailer

Server/Components/LegacyNetwork/legacy_network_impl.cpp

@@ -291,6 +291,12 @@ RakNetLegacyNetwork::~RakNetLegacyNetwork()
 		core->getPlayers().getPlayerChangeDispatcher().removeEventHandler(this);
 		core->getPlayers().getPlayerConnectDispatcher().removeEventHandler(this);
 	}
+
+	if (npcComponent)
+	{
+		npcComponent->getPoolEventDispatcher().removeEventHandler(this);
+	}
+
 	rakNetServer.Disconnect(300);
 	RakNet::RakNetworkFactory::DestroyRakServerInterface(&rakNetServer);
 }
@@ -899,6 +905,15 @@ void RakNetLegacyNetwork::start()
 	{
 		SAMPRakNet::SetGracePeriod(*gracePeriod);
 	}
+
+	// Set reserved slots based on NPC count once more because slots reserved
+	// Before RakServer::Start are reset because RakPeer::Start calls RakPeer::Disconnect
+	// As well which resets the value for RakPeer::reservedSlots class member.
+	// Note: this behavior does not affect slots reserved in next executions.
+	if (npcComponent)
+	{
+		rakNetServer.ReserveSlots(npcComponent->count());
+	}
 }
 
 void RakNetLegacyNetwork::onTick(Microseconds elapsed, TimePoint now)

Server/Components/LegacyNetwork/legacy_network_impl.hpp

@@ -20,6 +20,7 @@
 #include <raknet/RakNetworkFactory.h>
 #include <raknet/RakServerInterface.h>
 #include <raknet/StringCompressor.h>
+#include <Server/Components/NPCs/npcs.hpp>
 
 using namespace Impl;
 
@@ -34,7 +35,7 @@ static const StaticArray<StringView, 2> ProtectedRules = {
 
 class Core;
 
-class RakNetLegacyNetwork final : public Network, public CoreEventHandler, public PlayerConnectEventHandler, public PlayerChangeEventHandler, public INetworkQueryExtension
+class RakNetLegacyNetwork final : public Network, public CoreEventHandler, public PlayerConnectEventHandler, public PlayerChangeEventHandler, public INetworkQueryExtension, public PoolEventHandler<INPC>
 {
 private:
 	ICore* core = nullptr;
@@ -44,8 +45,24 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
 	StaticArray<RakNet::RakPeer::RemoteSystemStruct*, PLAYER_POOL_SIZE> playerRemoteSystem;
 	Milliseconds cookieSeedTime;
 	TimePoint lastCookieSeed;
+	INPCComponent* npcComponent = nullptr;
 
 public:
+	inline void setNPCComponent(INPCComponent* comp)
+	{
+		npcComponent = comp;
+
+		if (npcComponent)
+		{
+			npcComponent->getPoolEventDispatcher().addEventHandler(this);
+		}
+	}
+
+	inline INPCComponent* getNPCComponent()
+	{
+		return npcComponent;
+	}
+
 	inline void setQueryConsole(IConsoleComponent* console)
 	{
 		query.setConsole(console);
@@ -309,6 +326,22 @@ class RakNetLegacyNetwork final : public Network, public CoreEventHandler, publi
 		query.buildPlayerDependentBuffers(&player);
 	}
 
+	void onPoolEntryCreated(INPC& npc) override
+	{
+		if (npcComponent)
+		{
+			rakNetServer.ReserveSlots(npcComponent->count());
+		}
+	}
+
+	void onPoolEntryDestroyed(INPC& npc) override
+	{
+		if (npcComponent)
+		{
+			rakNetServer.ReserveSlots(npcComponent->count());
+		}
+	}
+
 	bool addRule(StringView rule, StringView value) override
 	{
 		if (isRuleProtected(rule))

Server/Components/LegacyNetwork/legacy_network_main.cpp

@@ -28,6 +28,7 @@ class RakNetLegacyNetworkComponent final : public INetworkComponent
 	void onInit(IComponentList* components) override
 	{
 		legacyNetwork.setQueryConsole(components->queryComponent<IConsoleComponent>());
+		legacyNetwork.setNPCComponent(components->queryComponent<INPCComponent>());
 	}
 
 	void onFree(IComponent* component) override
@@ -36,6 +37,11 @@ class RakNetLegacyNetworkComponent final : public INetworkComponent
 		{
 			legacyNetwork.setQueryConsole(nullptr);
 		}
+
+		if (component == legacyNetwork.getNPCComponent())
+		{
+			legacyNetwork.setNPCComponent(nullptr);
+		}
 	}
 
 	INetwork* getNetwork() override