SocialClubName removed. Allowlist removed from CoopSettings.xml

Client/Entities/EntitiesPlayer.cs

@@ -5,10 +5,6 @@
     /// </summary>
     public class EntitiesPlayer : EntitiesPed
     {
-        /// <summary>
-        /// ?
-        /// </summary>
-        public string SocialClubName { get; internal set; }
         /// <summary>
         /// ?
         /// </summary>

Client/Main.cs

@@ -274,7 +274,7 @@ namespace CoopClient
 
             if (!Players.ContainsKey(0))
             {
-                Players.Add(0, new EntitiesPlayer() { SocialClubName = "DEBUG", Username = "DebugPlayer" });
+                Players.Add(0, new EntitiesPlayer() { Username = "DebugPlayer" });
                 DebugSyncPed = Players[0];
             }
 

Client/Networking.cs

@@ -62,7 +62,6 @@ namespace CoopClient
                 new HandshakePacket()
                 {
                     NetHandle =  0,
-                    SocialClubName = Game.Player.Name,
                     Username = Main.MainSettings.Username,
                     ModVersion = Main.CurrentVersion,
                     NpcsAllowed = false
@@ -255,12 +254,7 @@ namespace CoopClient
         #region -- PLAYER --
         private void PlayerConnect(PlayerConnectPacket packet)
         {
-            EntitiesPlayer player = new EntitiesPlayer()
+            EntitiesPlayer player = new EntitiesPlayer() { Username = packet.Username };
-            {
-                SocialClubName = packet.SocialClubName,
-                Username = packet.Username,
-                LastUpdateReceived = Util.GetTickCount64()
-            };
 
             Main.Players.Add(packet.NetHandle, player);
             COOPAPI.Connected(packet.NetHandle);

Client/Packets.cs

@@ -274,15 +274,12 @@ namespace CoopClient
         public long NetHandle { get; set; }
 
         [ProtoMember(2)]
-        public string SocialClubName { get; set; }
-
-        [ProtoMember(3)]
         public string Username { get; set; }
 
-        [ProtoMember(4)]
+        [ProtoMember(3)]
         public string ModVersion { get; set; }
 
-        [ProtoMember(5)]
+        [ProtoMember(4)]
         public bool NpcsAllowed { get; set; }
 
         public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
@@ -302,7 +299,6 @@ namespace CoopClient
             HandshakePacket data = message.ReadBytes(len).Deserialize<HandshakePacket>();
 
             NetHandle = data.NetHandle;
-            SocialClubName = data.SocialClubName;
             Username = data.Username;
             ModVersion = data.ModVersion;
             NpcsAllowed = data.NpcsAllowed;

Server/Allowlist.cs

@@ -4,6 +4,6 @@ namespace CoopServer
 {
     public class Allowlist
     {
-        public List<string> SocialClubName { get; set; } = new();
+        public List<string> Username { get; set; } = new();
     }
 }

Server/Blocklist.cs

@@ -4,7 +4,6 @@ namespace CoopServer
 {
     public class Blocklist
     {
-        public List<string> SocialClubName { get; set; } = new();
         public List<string> Username { get; set; } = new();
         public List<string> IP { get; set; } = new();
     }

Server/Packets.cs

@@ -189,15 +189,12 @@ namespace CoopServer
         public long NetHandle { get; set; }
 
         [ProtoMember(2)]
-        public string SocialClubName { get; set; }
-
-        [ProtoMember(3)]
         public string Username { get; set; }
 
-        [ProtoMember(4)]
+        [ProtoMember(3)]
         public string ModVersion { get; set; }
 
-        [ProtoMember(5)]
+        [ProtoMember(4)]
         public bool NpcsAllowed { get; set; }
 
         public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
@@ -217,7 +214,6 @@ namespace CoopServer
             HandshakePacket data = message.ReadBytes(len).Deserialize<HandshakePacket>();
 
             NetHandle = data.NetHandle;
-            SocialClubName = data.SocialClubName;
             Username = data.Username;
             ModVersion = data.ModVersion;
             NpcsAllowed = data.NpcsAllowed;

Server/PlayerData.cs

@@ -4,7 +4,6 @@ namespace CoopServer
 {
     public struct PlayerData
     {
-        public string SocialClubName { get; set; }
         public string Username { get; set; }
         private LVector3 LastPosition { get; set; }
         private LVector3 CurrentPosition { get; set; }

Server/Server.cs

@@ -114,7 +114,7 @@ namespace CoopServer
                                 "\"version\": \"" + CompatibleVersion.Replace("_", ".") + "\", " +
                                 "\"players\": \"" + MainNetServer.ConnectionsCount + "\", " +
                                 "\"maxPlayers\": \"" + MainSettings.MaxPlayers + "\", " +
-                                "\"allowlist\": \"" + MainSettings.Allowlist + "\", " +
+                                "\"allowlist\": \"" + MainAllowlist.Username.Any() + "\", " +
                                 "\"mods\": \"" + MainSettings.ModsAllowed + "\", " +
                                 "\"npcs\": \"" + MainSettings.NpcsAllowed + "\", " +
                                 "\"country\": \"" + info.country + "\"" +
@@ -533,7 +533,7 @@ namespace CoopServer
         // Before we approve the connection, we must shake hands
         private void GetHandshake(NetConnection local, HandshakePacket packet)
         {
-            Logging.Debug("New handshake from: [SC: " + packet.SocialClubName + " | Name: " + packet.Username + " | Address: " + local.RemoteEndPoint.Address.ToString() + "]");
+            Logging.Debug("New handshake from: [Name: " + packet.Username + " | Address: " + local.RemoteEndPoint.Address.ToString() + "]");
 
             if (string.IsNullOrWhiteSpace(packet.Username))
             {
@@ -546,13 +546,10 @@ namespace CoopServer
                 return;
             }
 
-            if (MainSettings.Allowlist)
+            if (MainAllowlist.Username.Any() && !MainAllowlist.Username.Contains(packet.Username))
             {
-                if (!MainAllowlist.SocialClubName.Contains(packet.SocialClubName))
+                local.Deny("This Username is not on the allow list!");
-                {
+                return;
-                    local.Deny("This Social Club name is not on the allow list!");
-                    return;
-                }
             }
 
             if (!packet.ModVersion.StartsWith(CompatibleVersion))
@@ -561,28 +558,18 @@ namespace CoopServer
                 return;
             }
 
-            if (MainBlocklist.SocialClubName.Contains(packet.SocialClubName))
+            if (MainBlocklist.Username.Contains(packet.Username))
-            {
-                local.Deny("This Social Club name has been blocked by this server!");
-                return;
-            }
-            else if (MainBlocklist.Username.Contains(packet.Username))
             {
                 local.Deny("This Username has been blocked by this server!");
                 return;
             }
-            else if (MainBlocklist.IP.Contains(local.RemoteEndPoint.ToString().Split(":")[0]))
+            if (MainBlocklist.IP.Contains(local.RemoteEndPoint.ToString().Split(":")[0]))
             {
                 local.Deny("This IP was blocked by this server!");
                 return;
             }
 
-            if (Clients.Any(x => x.Player.SocialClubName.ToLower() == packet.SocialClubName.ToLower()))
+            if (Clients.Any(x => x.Player.Username.ToLower() == packet.Username.ToLower()))
-            {
-                local.Deny("The name of the Social Club is already taken!");
-                return;
-            }
-            else if (Clients.Any(x => x.Player.Username.ToLower() == packet.Username.ToLower()))
             {
                 local.Deny("Username is already taken!");
                 return;
@@ -601,7 +588,6 @@ namespace CoopServer
                         NetHandle = localNetHandle,
                         Player = new()
                         {
-                            SocialClubName = packet.SocialClubName,
                             Username = packet.Username
                         }
                     }
@@ -614,7 +600,6 @@ namespace CoopServer
             new HandshakePacket()
             {
                 NetHandle = localNetHandle,
-                SocialClubName = string.Empty,
                 Username = string.Empty,
                 ModVersion = string.Empty,
                 NpcsAllowed = MainSettings.NpcsAllowed
@@ -651,7 +636,6 @@ namespace CoopServer
                         new PlayerConnectPacket()
                         {
                             NetHandle = targetNetHandle,
-                            SocialClubName = targetClient.Player.SocialClubName,
                             Username = targetClient.Player.Username
                         }.PacketToNetOutGoingMessage(outgoingMessage);
                         MainNetServer.SendMessage(outgoingMessage, local, NetDeliveryMethod.ReliableOrdered, 0);
@@ -663,7 +647,6 @@ namespace CoopServer
                 new PlayerConnectPacket()
                 {
                     NetHandle = local.RemoteUniqueIdentifier,
-                    SocialClubName = localClient.Player.SocialClubName,
                     Username = localClient.Player.Username
                 }.PacketToNetOutGoingMessage(outgoingMessage);
                 MainNetServer.SendMessage(outgoingMessage, clients, NetDeliveryMethod.ReliableOrdered, 0);

Server/Settings.cs

@@ -9,7 +9,6 @@ namespace CoopServer
         public string Name { get; set; } = "GTACoop:R server";
         public string WelcomeMessage { get; set; } = "Welcome on this server :)";
         public List<string> Resources { get; set; } = new List<string>();
-        public bool Allowlist { get; set; } = false;
         public bool NpcsAllowed { get; set; } = true;
         public bool ModsAllowed {  get; set; } = false;
         public bool UPnP { get; set; } = true;