oh fuck i forgot to commit for a while

1 files changed, 12 insertions, 5 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/_menu_callbacks.gnut b/Northstar.CustomServers/mod/scripts/vscripts/_menu_callbacks.gnut
index c116ac33b..d0820dd6a 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/_menu_callbacks.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/_menu_callbacks.gnut
@@ -7,11 +7,18 @@ void function MenuCallbacks_Init()
 
 bool function ClientCommandCallback_LeaveMatch( entity player, array<string> args )
 {
-	// todo: ideally, it'd be nice to get clients to return to lobby here, rather than just dcing them
-	// kind of a pain tho, since we'd have to get it to call script code without a remote func, since that'd break compatibility
+	thread WritePersistenceAndLeave( player )
+	return true
+}
 
-	ClientCommand( player, "disconnect" )
-	//ClientCommand( player, "setplaylist tdm; map mp_lobby" )
+void function WritePersistenceAndLeave( entity player )
+{
+	// write player persistence before we leave, since leaving player might load local lobby before server writes persistence, so they won't get newest
+	// not super essential, but a nice qol thing
+	NSEarlyWritePlayerPersistenceForLeave( player )
+	while ( NSIsWritingPlayerPersistence() )
+		WaitFrame()
 	
-	return true
+	// this is a custom concommand which can be called on clients, it causes them to leave and doesn't have issues if they're host
+	ClientCommand( player, "ns_leave_to_lobby" )
 }
\ No newline at end of file