Merge remote-tracking branch 'origin/main'

2025-09-22 11:26:43 +02:00
parent bf9ae5f01f 83fad59878
commit f27a1df90f
789 changed files with 14011 additions and 16477 deletions
@@ -64,7 +64,11 @@ export class StartGameCommandHandler {
                gamecode,
                maxplayers: command.maxplayers,
                logintype: command.logintype,
+<<<<<<< HEAD
                createdby: command.userid!,
+=======
+                createdby: command.userid || null,
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
                orgid: command.orgid || null,
                gamedecks,
                players: [],