diff -r 6a9ff57fb9f9 -r d54c379f7171 core/sourcemod.cpp
--- a/core/sourcemod.cpp	Sat Nov 24 18:17:00 2007 +0000
+++ b/core/sourcemod.cpp	Sun Nov 25 02:45:12 2007 +0000
@@ -85,7 +85,6 @@
 {
 	m_IsMapLoading = false;
 	m_ExecPluginReload = false;
-	m_ExecOnMapEnd = false;
 	m_GotBasePath = false;
 }
 
@@ -326,7 +325,6 @@
 
 	m_IsMapLoading = true;
 	m_ExecPluginReload = true;
-	m_ExecOnMapEnd = true;
 
 	/* Notify! */
 	SMGlobalClass *pBase = SMGlobalClass::head;
@@ -368,13 +366,15 @@
 			next->OnSourceModLevelEnd();
 			next = next->m_pGlobalClassNext;
 		}
-		g_LevelEndBarrier = false;
-	}
+		
+		if (g_pOnMapEnd != NULL)
+		{
+			g_pOnMapEnd->Execute(NULL);
+		}
 
-	if (g_pOnMapEnd && m_ExecOnMapEnd)
-	{
-		g_pOnMapEnd->Execute(NULL);
-		m_ExecOnMapEnd = false;
+		g_Timers.RemoveMapChangeTimers();
+
+		g_LevelEndBarrier = false;
 	}
 
 	g_OnMapStarted = false;