1.1 --- a/core/sourcemod.cpp	Sat Nov 24 18:17:00 2007 +0000
     1.2 +++ b/core/sourcemod.cpp	Sun Nov 25 02:45:12 2007 +0000
     1.3 @@ -85,7 +85,6 @@
     1.4  {
     1.5  	m_IsMapLoading = false;
     1.6  	m_ExecPluginReload = false;
     1.7 -	m_ExecOnMapEnd = false;
     1.8  	m_GotBasePath = false;
     1.9  }
    1.10  
    1.11 @@ -326,7 +325,6 @@
    1.12  
    1.13  	m_IsMapLoading = true;
    1.14  	m_ExecPluginReload = true;
    1.15 -	m_ExecOnMapEnd = true;
    1.16  
    1.17  	/* Notify! */
    1.18  	SMGlobalClass *pBase = SMGlobalClass::head;
    1.19 @@ -368,13 +366,15 @@
    1.20  			next->OnSourceModLevelEnd();
    1.21  			next = next->m_pGlobalClassNext;
    1.22  		}
    1.23 -		g_LevelEndBarrier = false;
    1.24 -	}
    1.25 +		
    1.26 +		if (g_pOnMapEnd != NULL)
    1.27 +		{
    1.28 +			g_pOnMapEnd->Execute(NULL);
    1.29 +		}
    1.30  
    1.31 -	if (g_pOnMapEnd && m_ExecOnMapEnd)
    1.32 -	{
    1.33 -		g_pOnMapEnd->Execute(NULL);
    1.34 -		m_ExecOnMapEnd = false;
    1.35 +		g_Timers.RemoveMapChangeTimers();
    1.36 +
    1.37 +		g_LevelEndBarrier = false;
    1.38  	}
    1.39  
    1.40  	g_OnMapStarted = false;