2 files changed, 20 insertions, 1 deletions
diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDedicatedTest/serverauthentication.cpp
index e89c4e92..e50b9357 100644
--- a/NorthstarDedicatedTest/serverauthentication.cpp
+++ b/NorthstarDedicatedTest/serverauthentication.cpp
@@ -356,6 +356,8 @@ bool CBaseClient__ConnectHook(void* self, char* name, __int64 netchan_ptr_arg, c
 		additionalData.usingLocalPdata = *((char*)self + 0x4a0) == (char)0x3;
 
 		g_ServerAuthenticationManager->m_additionalPlayerData.insert(std::make_pair(self, additionalData));
+
+		g_ServerAuthenticationManager->m_additionalPlayerData[self].uid = nextPlayerUid;
 	}
 
 	return ret;
@@ -363,6 +365,21 @@ bool CBaseClient__ConnectHook(void* self, char* name, __int64 netchan_ptr_arg, c
 
 void CBaseClient__ActivatePlayerHook(void* self)
 {
+	bool uidMatches = false;
+	if (g_ServerAuthenticationManager->m_additionalPlayerData.count(self))
+	{
+		std::string strUid = std::to_string(g_ServerAuthenticationManager->m_additionalPlayerData[self].uid);
+		if (!strcmp(strUid.c_str(), (char*)self + 0xF500)) // connecting client's uid is the same as auth's uid
+		{
+			uidMatches = true;
+		}
+	}
+	if (!uidMatches)
+	{
+		CBaseClient__Disconnect(self, 1, "Authentication Failed");
+		return;
+	}
+
 	// if we're authed, write our persistent data
 	// RemovePlayerAuthData returns true if it removed successfully, i.e. on first call only, and we only want to write on >= second call
 	// (since this func is called on map loads)
diff --git a/NorthstarDedicatedTest/serverauthentication.h b/NorthstarDedicatedTest/serverauthentication.h
index 06834d30..6768e149 100644
--- a/NorthstarDedicatedTest/serverauthentication.h
+++ b/NorthstarDedicatedTest/serverauthentication.h
@@ -28,6 +28,8 @@ struct AdditionalPlayerData
 
 	double lastSayTextLimitStart = -1.0;
 	int sayTextLimitCount = 0;
+
+	uint64_t uid;
 };
 
 #pragma once
@@ -107,4 +109,4 @@ extern CBaseClient__DisconnectType CBaseClient__Disconnect;
 void InitialiseServerAuthentication(HMODULE baseAddress);
 
 extern ServerAuthenticationManager* g_ServerAuthenticationManager;
-extern ConVar* Cvar_ns_player_auth_port;
-\ No newline at end of file
+extern ConVar* Cvar_ns_player_auth_port;