Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ConfigsExecutedForward (my mistake) (#1024)

Browse Source 
* Fix one big issue what broken all plugins!

If found any config from servercmd, m_ConfigsExecutedForward not called !!!!!!!
If m_ConfigsExecutedForward  not called, this is broke all plugins where used m_ConfigsExecutedForward (example restmenu)

Revert "Fix one big issue what broken all plugins!"

This reverts commit 6ce36f22e1c278f0831ebbddbc1dbbceb91dacb9.

* Fix m_ConfigsExecutedForward after my missprint from previous pr

Fix my missprint from previous pull request 275be8b0a8
This commit is contained in:
Unreal Karaulov 2021-12-04 23:04:08 +03:00 committed by GitHub
parent 275be8b0a8
commit 6e8554d1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
amxmodx/CoreConfig.cpp
View File

@ -296,16 +296,19 @@ void CoreConfig::OnMapConfigTimer()
return;
}
if (m_PendingForwardPush)
if (m_legacyMapConfigNextTime <= gpGlobals->time)
{
m_PendingForwardPush = false;
m_ConfigsExecuted = true;
if (m_PendingForwardPush)
{
m_PendingForwardPush = false;
m_ConfigsExecuted = true;
executeForwards(m_ConfigsExecutedForward);
}
else if (!m_LegacyMapConfigsExecuted && m_legacyMapConfigNextTime <= gpGlobals->time)
{
ExecuteMapConfig();
executeForwards(m_ConfigsExecutedForward);
}
else if (!m_LegacyMapConfigsExecuted)
{
ExecuteMapConfig();
}
}
}
@ -316,9 +319,17 @@ void CoreConfig::CheckLegacyBufferedCommand(char *command)
return;
}
if (!m_LegacyMainConfigExecuted && (strstr(command, MainConfigFile) || strstr(command, MapConfigDir)))
if (!m_LegacyMainConfigExecuted && strstr(command, MainConfigFile))
{
m_LegacyMainConfigExecuted = true;
}
if (!m_LegacyMapConfigsExecuted && strstr(command, MapConfigDir))
{
m_LegacyMapConfigsExecuted = true;
// Consider all configs be executed to m_legacyMapConfigNextTime time.
m_PendingForwardPush = true;
}
}