Merge remote-tracking branch 'origin/develop' into develop

Timmlion · Jan 28, 2024 · 843d4cb · 843d4cb
2 parents d728bd4 + 01cdbe7
commit 843d4cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/backend/MemeBE/hubs/GameHub.cs b/backend/MemeBE/hubs/GameHub.cs
@@ -32,7 +32,7 @@ public async Task SendMessage(string user, string message)
 
     public async Task GetRooms()
     {
-        Console.WriteLine("GetRooms");
+        /*Console.WriteLine("GetRooms");
         try
         {
             string[] roomIDs = rooms.Values
@@ -45,7 +45,7 @@ public async Task GetRooms()
         catch
         {
             // ignore
-        }
+        }*/
     }
 
     public async Task CreateRoom(string playerName)
@@ -294,7 +294,7 @@ public async Task GameEnded(Room room)
 
         await Clients.Group(room.RoomId)
             .SendAsync("GameEnded", message);
-        rooms.Remove(room.RoomId);
+        //rooms.Remove(room.RoomId);
     }
     public List<Player> GetOtherPlayers(Room room, string connId)
     {
@@ -432,4 +432,4 @@ await Clients.Group(room.RoomId)
     // Target = 0 - all
     // 1 - player
     // 2 - persistent slot
-}
+}
diff --git a/client/static/js/main.js b/client/static/js/main.js
@@ -13,7 +13,7 @@ $(document).ready(function () {
 function initServer() {
     connection = new signalR.HubConnectionBuilder()
         // .withUrl("https://578d-87-206-130-93.ngrok-free.app/GameHub")
-        .withUrl("https://memethegatheringapi.azurewebsites.net/GameHub")
+        .withUrl("https://magicthememeingapiprod.azurewebsites.net/GameHub")
         // .withUrl("https://578d-87-206-130-93.ngrok-free.app/GameHub")
         .withAutomaticReconnect()
         .configureLogging(signalR.LogLevel.Information)
@@ -363,4 +363,4 @@ function ForceEndgame(){
     connection.invoke("DebugGameEnded", currentRoomID).catch(function (err) {
         return console.error(err.toString());
     });
-}
+}