vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server ignores kick votes if the client has already voted to kick the same player. Closes #615

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-08-11 17:29:03 +03:00
parent d98de2c305
commit 091dcf35e6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/Client.cs
+5
View File
@@ -212,6 +212,11 @@ namespace Barotrauma.Networking
kickVoters.Remove(voter); kickVoters.Remove(voter);
} }
public bool HasKickVoteFrom(Client voter)
{
return kickVoters.Contains(voter);
}
public bool HasKickVoteFromID(int id) public bool HasKickVoteFromID(int id)
{ {
return kickVoters.Any(k => k.ID == id); return kickVoters.Any(k => k.ID == id);
Barotrauma/BarotraumaShared/Source/Networking/Voting.cs
+1 -1
View File
@@ -122,7 +122,7 @@ namespace Barotrauma
byte kickedClientID = inc.ReadByte(); byte kickedClientID = inc.ReadByte();
Client kicked = GameMain.Server.ConnectedClients.Find(c => c.ID == kickedClientID); Client kicked = GameMain.Server.ConnectedClients.Find(c => c.ID == kickedClientID);
if (kicked != null) if (kicked != null && !kicked.HasKickVoteFrom(sender))
{ {
kicked.AddKickVote(sender); kicked.AddKickVote(sender);
Client.UpdateKickVotes(GameMain.Server.ConnectedClients); Client.UpdateKickVotes(GameMain.Server.ConnectedClients);