rebase
This commit is contained in:
parent
96cfbef642
commit
0fbe08a5cf
1 changed files with 0 additions and 4 deletions
|
|
@ -223,16 +223,12 @@ class StateI {
|
|||
}
|
||||
|
||||
public newPausedGame(suid1: string, suid2: string): GameId | undefined {
|
||||
<<<<<<< HEAD
|
||||
if (
|
||||
!this.users.has(suid1 as UserId) ||
|
||||
!this.users.has(suid2 as UserId)
|
||||
) {
|
||||
return undefined;
|
||||
}
|
||||
=======
|
||||
|
||||
>>>>>>> 78eb546 (Added U Game system)
|
||||
const uid1: UserId = suid1 as UserId;
|
||||
const uid2: UserId = suid2 as UserId;
|
||||
const g = new Pong(uid1, uid2);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue