From 8f3b4afcf7ed1e7cb840daee100f42ca4cb86618 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <skamonkey@gmail.com>
Date: Wed, 12 Jan 2011 18:59:34 -0500
Subject: [PATCH] Removed tv_enable hook to fix rare max client count issue
 (bug 4791, r=fyren).

---
 core/PlayerManager.cpp | 16 ----------------
 core/PlayerManager.h   |  5 +----
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index 0896678b..2cc213cb 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -159,8 +159,6 @@ void PlayerManager::OnSourceModAllInitialized()
 	m_bIsListenServer = !engine->IsDedicatedServer();
 	m_ListenClient = 0;
 
-	g_ConVarManager.AddConVarChangeListener("tv_enable", this);
-
 	ConCommand *pCmd = FindCommand("maxplayers");
 	if (pCmd != NULL)
 	{
@@ -198,8 +196,6 @@ void PlayerManager::OnSourceModShutdown()
 
 	delete [] m_Players;
 
-	g_ConVarManager.RemoveConVarChangeListener("tv_enable", this);
-
 	if (maxplayersCmd != NULL)
 	{
 		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, maxplayersCmd, CmdMaxplayersCallback, true);
@@ -1344,18 +1340,6 @@ void PlayerManager::ProcessCommandTarget(cmd_target_info_t *info)
 	}
 }
 
-void PlayerManager::OnConVarChanged( ConVar *pConVar, const char *oldValue, float flOldValue )
-{
-	if (pConVar->GetBool() && !atoi(oldValue))
-	{
-		MaxPlayersChanged(gpGlobals->maxClients + 1);
-	}
-	else
-	{
-		MaxPlayersChanged();
-	}
-}
-
 void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
 {
 	m_maxClients = newvalue;
diff --git a/core/PlayerManager.h b/core/PlayerManager.h
index 620af948..452cf559 100644
--- a/core/PlayerManager.h
+++ b/core/PlayerManager.h
@@ -123,8 +123,7 @@ private:
 
 class PlayerManager : 
 	public SMGlobalClass,
-	public IPlayerManager,
-	public IConVarChangeListener
+	public IPlayerManager
 {
 	friend class CPlayer;
 public:
@@ -169,8 +168,6 @@ public: //IPlayerManager
 	void UnregisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void ProcessCommandTarget(cmd_target_info_t *info);
 	int GetClientFromSerial(unsigned int serial);
-public: // IConVarChangeListener
-	void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
 public:
 	inline int MaxClients()
 	{