Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2025-04-16 18:08:37 -03:00
parent 3ac4ae992c 6203171b6d
commit 5e321a5abd
20 changed files with 106 additions and 41 deletions
@@ -284,7 +284,12 @@ namespace Barotrauma
                    break;
                case VoteType.Kick:
                    byte kickedClientID = inc.ReadByte();
-                    if ((DateTime.Now - sender.JoinTime).TotalSeconds < GameMain.Server.ServerSettings.DisallowKickVoteTime)
+
+                    if (!GameMain.Server.ServerSettings.AllowVoteKick)
+                    {
+                        DebugConsole.ThrowError($"Client {sender.Name} attempted to vote to kick a client, even though vote kicking is disabled. Ignoring the vote.");
+                    }
+                    else if ((DateTime.Now - sender.JoinTime).TotalSeconds < GameMain.Server.ServerSettings.DisallowKickVoteTime)
                    {
                        GameMain.Server.SendDirectChatMessage($"ServerMessage.kickvotedisallowed", sender);
                    }