vlad.os/LuaCsForBarotraumaEP
1
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

16
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
View File

@@ -1332,31 +1332,31 @@ namespace Barotrauma.Networking
public override bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
{
if (character == null) return false;
if (character != myCharacter)
{
var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character);
if (client == null) return false;
if (HasPermission(ClientPermissions.Ban))
{
var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, "", characterFrame);
var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), TextManager.Get("Ban"), Alignment.BottomRight, "", characterFrame);
banButton.UserData = character.Name;
banButton.OnClicked += GameMain.NetLobbyScreen.BanPlayer;
banButton.OnClicked += GameMain.NetLobbyScreen.BanPlayer;
}
if (HasPermission(ClientPermissions.Kick))
{
var kickButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Kick", Alignment.BottomLeft, "", characterFrame);
var kickButton = new GUIButton(new Rectangle(0, 0, 100, 20), TextManager.Get("Kick"), Alignment.BottomLeft, "", characterFrame);
kickButton.UserData = character.Name;
kickButton.OnClicked += GameMain.NetLobbyScreen.KickPlayer;
}
else if (Voting.AllowVoteKick)
{
var kickVoteButton = new GUIButton(new Rectangle(0, 0, 120, 20), "Vote to Kick", Alignment.BottomLeft, "", characterFrame);
var kickVoteButton = new GUIButton(new Rectangle(0, 0, 120, 20), TextManager.Get("VoteToKick"), Alignment.BottomLeft, "", characterFrame);
if (GameMain.NetworkMember.ConnectedClients != null)
{
kickVoteButton.Enabled = !client.HasKickVoteFromID(myID);
kickVoteButton.Enabled = !client.HasKickVoteFromID(myID);
}
kickVoteButton.UserData = character;

11
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
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;

1
Barotrauma/BarotraumaShared/Content/Texts.xml
View File

@@ -190,6 +190,7 @@
<Permissions>Permissions</Permissions>
<PermittedConsoleCommands>Permitted console commands</PermittedConsoleCommands>
<Kick>Kick</Kick>
<VoteToKick>Vote to kick</VoteToKick>
<Ban>Ban</Ban>
<BanRange>Ban range</BanRange>
<PrivateMessageTag>[PM]</PrivateMessageTag>