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

Fixed clients being able to votekick/kick/ban themselves in the server lobby.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-16 17:39:20 +02:00
parent 633bd85e27
commit 8544dea9db
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+7 -4
View File
@@ -871,17 +871,20 @@ namespace Barotrauma
private bool SelectPlayer(GUIComponent component, object obj)
{
var selectedClient = GameMain.NetworkMember.ConnectedClients.Find(c => c.Name == obj.ToString());
if (selectedClient == null) return false;
if (GameMain.Client != null)
{
if (selectedClient.ID == GameMain.Client.ID) return false;
if (!GameMain.Client.HasPermission(ClientPermissions.Ban) &&
!GameMain.Client.HasPermission(ClientPermissions.Kick) &&
!GameMain.Client.Voting.AllowVoteKick)
{
return false;
}
}
var selectedClient = GameMain.NetworkMember.ConnectedClients.Find(c => c.Name == obj.ToString());
}
playerFrame = new GUIFrame(new Rectangle(0, 0, 0, 0), Color.Black * 0.6f);
@@ -1030,7 +1033,7 @@ namespace Barotrauma
if (GameMain.Client != null && GameMain.Client.Voting.AllowVoteKick && selectedClient != null)
{
var kickVoteButton = new GUIButton(new Rectangle(0, -30, 120, 20), "Vote to Kick", Alignment.BottomLeft, "", playerFrameInner);
var kickVoteButton = new GUIButton(new Rectangle(0, -30, 120, 20), TextManager.Get("VoteToKick"), Alignment.BottomLeft, "", playerFrameInner);
kickVoteButton.Enabled = !selectedClient.HasKickVoteFromID(GameMain.Client.ID);
kickVoteButton.UserData = selectedClient;
kickVoteButton.OnClicked += GameMain.Client.VoteForKick;