Fix namespaces and missing await

diff --git a/src/Impostor.Server/Net/Matchmaker.cs b/src/Impostor.Server/Net/Matchmaker.cs
index 2bcc7faea3b5e0c76d300dc93162f8de82b3ab6e..54a05811baa418a5cc657e8bf27b234263ff4156 100644 (file)
--- a/src/Impostor.Server/Net/Matchmaker.cs
+++ b/src/Impostor.Server/Net/Matchmaker.cs
@@ -7,7 +7,7 @@ using Impostor.Hazel.Udp;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;
 
-namespace Impostor.Server.Hazel
+namespace Impostor.Server.Net
 {
     internal class Matchmaker
     {

diff --git a/src/Impostor.Server/Net/MatchmakerService.cs b/src/Impostor.Server/Net/MatchmakerService.cs
index cdbe44d03c8dc8f91565e78e2d5a404a25b67de0..cd6d70ef0876d1118e4e0bf273b9d322a91e3579 100644 (file)
--- a/src/Impostor.Server/Net/MatchmakerService.cs
+++ b/src/Impostor.Server/Net/MatchmakerService.cs
@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Server.Data;
-using Impostor.Server.Hazel;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/src/Impostor.Server/Net/State/Game.Outgoing.cs b/src/Impostor.Server/Net/State/Game.Outgoing.cs
index c602ffd35ca55753e43213ae3e74558c8b5bdc3d..14c493b0efd26e85c94257bb9d60c6980e89d95b 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.Outgoing.cs
+++ b/src/Impostor.Server/Net/State/Game.Outgoing.cs
@@ -10,36 +10,30 @@ namespace Impostor.Server.Net.State
 {
     internal partial class Game
     {
-        public ValueTask SendToAllAsync(IMessageWriter writer, LimboStates states = LimboStates.NotLimbo)
+        public async ValueTask SendToAllAsync(IMessageWriter writer, LimboStates states = LimboStates.NotLimbo)
         {
             foreach (var connection in GetConnections(x => x.Limbo.HasFlag(states)))
             {
-                connection.SendAsync(writer);
+                await connection.SendAsync(writer);
             }
-
-            return default;
         }
 
-        public ValueTask SendToAllExceptAsync(IMessageWriter writer, int senderId, LimboStates states = LimboStates.NotLimbo)
+        public async ValueTask SendToAllExceptAsync(IMessageWriter writer, int senderId, LimboStates states = LimboStates.NotLimbo)
         {
             foreach (var connection in GetConnections(x =>
                 x.Limbo.HasFlag(states) &&
                 x.Client.Id != senderId))
             {
-                connection.SendAsync(writer);
+                await connection.SendAsync(writer);
             }
-
-            return default;
         }
 
-        public ValueTask SendToAsync(IMessageWriter writer, int id)
+        public async ValueTask SendToAsync(IMessageWriter writer, int id)
         {
             if (TryGetPlayer(id, out var player) && player.Client.Connection is HazelConnection hazelConnection)
             {
-                hazelConnection.InnerConnection.SendAsync(writer);
+                await hazelConnection.InnerConnection.SendAsync(writer);
             }
-
-            return default;
         }
 
         private void WriteRemovePlayerMessage(IMessageWriter message, bool clear, int playerId, DisconnectReason reason)

diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs
index fd1d09c346e1d43398c4054fa332cdcc872f09f1..5aa792543f8acd5ffb94b070262ae6409c309e97 100644 (file)
--- a/src/Impostor.Server/Net/State/Game.cs
+++ b/src/Impostor.Server/Net/State/Game.cs
@@ -12,7 +12,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Server.Hazel;
 using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Manager;
 using Impostor.Server.Net.Redirector;

diff --git a/src/Impostor.Server/Program.cs b/src/Impostor.Server/Program.cs
index 12c9588fa95ed00193fda7bd8e48c08197dabcbc..8c9e7a3d2361daab493706c7b36864f1b454ea65 100644 (file)
--- a/src/Impostor.Server/Program.cs
+++ b/src/Impostor.Server/Program.cs
@@ -4,7 +4,6 @@ using Impostor.Api.Games.Managers;
 using Impostor.Api.Net.Manager;
 using Impostor.Server.Data;
 using Impostor.Server.Events;
-using Impostor.Server.Hazel;
 using Impostor.Server.Net;
 using Impostor.Server.Net.Factories;
 using Impostor.Server.Net.Manager;