UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't enable FileExists hook (SendFile forward) on TF2 servers with Replay. (#512)

Browse Source 
It will crash. See PR #493 for details.
This commit is contained in:
Nicholas Hastings 2016-05-19 19:11:28 -04:00
parent 57c6e09fcf
commit 5edc46c994
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/sdktools/extension.cpp
View File

@ -313,6 +313,7 @@ void SDKTools::OnCoreMapStart(edict_t *pEdictList, int edictCount, int clientMax
{ {
InitTeamNatives(); InitTeamNatives();
GetResourceEntity(); GetResourceEntity();
g_Hooks.OnMapStart();
} }
bool SDKTools::QueryRunning(char *error, size_t maxlength) bool SDKTools::QueryRunning(char *error, size_t maxlength)

20
extensions/sdktools/hooks.cpp
View File

@ -111,6 +111,15 @@ void CHookManager::Shutdown()
sharesys->DropCapabilityProvider(myself, this, FEATURECAP_PLAYERRUNCMD_11PARAMS); sharesys->DropCapabilityProvider(myself, this, FEATURECAP_PLAYERRUNCMD_11PARAMS);
} }
void CHookManager::OnMapStart()
{
m_bFSTranHookWarned = false;
#if SOURCE_ENGINE == SE_TF2
static ConVarRef replay_enable("replay_enable");
m_bReplayEnabled = replay_enable.GetBool();
#endif
}
void CHookManager::OnClientConnect(int client) void CHookManager::OnClientConnect(int client)
{ {
NetChannelHook(client); NetChannelHook(client);
@ -238,6 +247,17 @@ void CHookManager::NetChannelHook(int client)
size_t iter; size_t iter;
/* Initial Hook */ /* Initial Hook */
#if SOURCE_ENGINE == SE_TF2
if (m_bReplayEnabled)
{
if (!m_bFSTranHookWarned)
{
g_pSM->LogError(myself, "OnFileSend hooks are not currently working on TF2 servers with Replay enabled.");
m_bFSTranHookWarned = true;
}
}
else
#endif
if (!m_netChannelHooks.length()) if (!m_netChannelHooks.length())
{ {
CVTableHook filehook(basefilesystem); CVTableHook filehook(basefilesystem);

3
extensions/sdktools/hooks.h
View File

@ -49,6 +49,7 @@ public:
void OnClientConnect(int client); void OnClientConnect(int client);
void OnClientPutInServer(int client); void OnClientPutInServer(int client);
void PlayerRunCmd(CUserCmd *ucmd, IMoveHelper *moveHelper); void PlayerRunCmd(CUserCmd *ucmd, IMoveHelper *moveHelper);
void OnMapStart();
public: /* NetChannel/Related Hooks */ public: /* NetChannel/Related Hooks */
bool FileExists(const char *filename, const char *pathID); bool FileExists(const char *filename, const char *pathID);
#if SOURCE_ENGINE >= SE_ALIENSWARM || SOURCE_ENGINE == SE_LEFT4DEAD || SOURCE_ENGINE == SE_LEFT4DEAD2 #if SOURCE_ENGINE >= SE_ALIENSWARM || SOURCE_ENGINE == SE_LEFT4DEAD || SOURCE_ENGINE == SE_LEFT4DEAD2
@ -75,6 +76,8 @@ private:
ke::Vector<CVTableHook *> m_runUserCmdHooks; ke::Vector<CVTableHook *> m_runUserCmdHooks;
ke::Vector<CVTableHook *> m_netChannelHooks; ke::Vector<CVTableHook *> m_netChannelHooks;
INetChannel *m_pActiveNetChannel; INetChannel *m_pActiveNetChannel;
bool m_bFSTranHookWarned = false;
bool m_bReplayEnabled = false;
}; };
extern CHookManager g_Hooks; extern CHookManager g_Hooks;