From: AeonLucid <aeonlucid@gmail.com>
Date: Mon, 19 Oct 2020 14:34:48 +0000 (+0200)
Subject: Fix namespaces and missing await
X-Git-Tag: v1.2.2~96^2~60
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=7e01a20fedd852671bc048dc6d220e30c1a559ee;p=rhonda%2Fimpostor.git

Fix namespaces and missing await
---

diff --git a/src/Impostor.Server/Net/Matchmaker.cs b/src/Impostor.Server/Net/Matchmaker.cs
index 2bcc7fa..54a0581 100644
--- 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 cdbe44d..cd6d70e 100644
--- 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 c602ffd..14c493b 100644
--- 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 fd1d09c..5aa7925 100644
--- 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 12c9588..8c9e7a3 100644
--- 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;