5 files changed, 21 insertions, 5 deletions
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut b/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut
index 7aa6940c..06270c39 100644
--- a/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut
+++ b/Northstar.CustomServers/scripts/vscripts/mp/_changemap.nut
@@ -14,7 +14,11 @@ void function CodeCallback_MatchIsOver()
 	if ( GetCurrentPlaylistVarInt( "return_to_private_lobby", 0 ) == 1 ) // set in _private_lobby.gnut, temp lol
 	{
 		SetCurrentPlaylist( "private_match" ) // needed for private lobby to load
-		GameRules_ChangeMap( "mp_lobby", "tdm" ) // need to change back to tdm 
+		
+		if ( IsSingleplayer() )
+			GameRules_ChangeMap( "mp_lobby", "tdm" ) // need to change back to tdm 
+		else
+			GameRules_ChangeMap( "mp_lobby", GAMETYPE )
 		// this is esp important for sp, since solo will break a bunch of shit in the private lobby
 		// idk if even necessary to deal with solo but eh whatever better to have it work than not
 	}
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut b/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
index f6cedd4e..7d5fb9f0 100644
--- a/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
+++ b/Northstar.CustomServers/scripts/vscripts/mp/_classic_mp_dropship_intro.gnut
@@ -72,7 +72,9 @@ void function DropshipIntro_OnClientConnected( entity player )
 					
 					return
 				}
-			
+	
+	// if we're at this point, we have more players than we do dropships, oh dear
+	RespawnAsPilot( player )
 }
 
 void function DropshipIntro_OnClientDisconnected( entity player )
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/scripts/vscripts/mp/_score.nut
index c54bbf8d..238eab1d 100644
--- a/Northstar.CustomServers/scripts/vscripts/mp/_score.nut
+++ b/Northstar.CustomServers/scripts/vscripts/mp/_score.nut
@@ -31,7 +31,7 @@ void function AddPlayerScore( entity targetPlayer, string scoreEventName, entity
 {
 	ScoreEvent event = GetScoreEvent( scoreEventName )
 	
-	if ( !event.enabled || !targetPlayer.IsPlayer() )
+	if ( !event.enabled || !IsValid( targetPlayer ) || !targetPlayer.IsPlayer() )
 		return
 
 	var associatedHandle = 0
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut
index 37b89169..398b2fc5 100644
--- a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut
+++ b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum.nut
@@ -1 +1,6 @@
-//fuck
-\ No newline at end of file
+global function CodeCallback_MapInit
+
+void function CodeCallback_MapInit()
+{
+	SetupLiveFireMaps()
+}
+\ No newline at end of file
diff --git a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut
index 37b89169..398b2fc5 100644
--- a/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut
+++ b/Northstar.CustomServers/scripts/vscripts/mp/levels/mp_coliseum_column.nut
@@ -1 +1,6 @@
-//fuck
-\ No newline at end of file
+global function CodeCallback_MapInit
+
+void function CodeCallback_MapInit()
+{
+	SetupLiveFireMaps()
+}
+\ No newline at end of file