From b15b3d5c1bb1c02030c71a86edb8227ce92efddd Mon Sep 17 00:00:00 2001
From: HitPanda <104197232+EnefFlow@users.noreply.github.com>
Date: Tue, 16 May 2023 00:01:20 +0300
Subject: [PATCH] removed player left/joined, added round id (#59)

---
 .../Administration/Systems/BwoinkSystem.cs    |  3 ++-
 .../GameTicking/GameTicker.Player.cs          | 18 ------------------
 .../UtkaIntegration/UtkaCommunication.cs      | 19 ++-----------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index ad4c10d2b9..15ce037c7d 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -638,7 +638,8 @@ namespace Content.Server.Administration.Systems
             {
                 Message = message,
                 Ckey = ckey,
-                Sender = sender
+                Sender = sender,
+                Rid = Get<GameTicker>().RoundId
             };
 
             _utkaSockets.SendMessageToAll(utkaAhelpEvent);
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index 8304956b54..decb9e3b7c 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -1,5 +1,4 @@
 using Content.Server.Database;
-using Content.Server.UtkaIntegration;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using Content.Shared.Players;
@@ -17,7 +16,6 @@ namespace Content.Server.GameTicking
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
-        [Dependency] private readonly UtkaTCPWrapper _utkaSockets = default!; // WD
 
         private void InitializePlayer()
         {
@@ -67,14 +65,6 @@ namespace Content.Server.GameTicking
                         ? Loc.GetString("player-first-join-message", ("name", args.Session.Name))
                         : Loc.GetString("player-join-message", ("name", args.Session.Name)));
 
-                    //WD start
-                    var utkaPlayerJoined = new UtkaPlayerJoinedEvent()
-                    {
-                        Ckey = args.Session.Name
-                    };
-                    _utkaSockets.SendMessageToAll(utkaPlayerJoined);
-                    //WD end
-
                     if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
                     {
                         _roundStartCountdownHasNotStartedYetDueToNoPlayers = false;
@@ -133,14 +123,6 @@ namespace Content.Server.GameTicking
                         mind.Session = null;
                     }
 
-                    //WD start
-                    var utkaPlayerLeft = new UtkaPlayerLeftEvent()
-                    {
-                        Ckey = args.Session.Name
-                    };
-                    _utkaSockets.SendMessageToAll(utkaPlayerLeft);
-                    //WD end
-
                     if (_playerGameStatuses.ContainsKey(args.Session.UserId)) //WD-EDIT
                         _userDb.ClientDisconnected(session);
                     break;
diff --git a/Content.Server/UtkaIntegration/UtkaCommunication.cs b/Content.Server/UtkaIntegration/UtkaCommunication.cs
index f84ab54cce..5fb2515de4 100644
--- a/Content.Server/UtkaIntegration/UtkaCommunication.cs
+++ b/Content.Server/UtkaIntegration/UtkaCommunication.cs
@@ -184,24 +184,9 @@ public sealed class UtkaAhelpPmEvent : UtkaBaseMessage
 
     [JsonPropertyName("sender")]
     public string? Sender { get; set; }
-}
 
-public sealed class UtkaPlayerJoinedEvent : UtkaBaseMessage
-{
-    [JsonPropertyName("command")]
-    public override string? Command => "player_joined";
-
-    [JsonPropertyName("ckey")]
-    public string? Ckey { get; set; }
-}
-
-public sealed class UtkaPlayerLeftEvent : UtkaBaseMessage
-{
-    [JsonPropertyName("command")]
-    public override string? Command => "player_left";
-
-    [JsonPropertyName("ckey")]
-    public string? Ckey { get; set; }
+    [JsonPropertyName("rid")]
+    public int? Rid { get; set; }
 }
 
 public sealed class UtkaBannedEvent : UtkaBaseMessage