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

Fixed clients being unable to give non-permanent or range bans. Closes #481

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-16 11:24:11 +03:00
parent ceae0bf94e
commit 734b86bfba
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+2
View File
@@ -1441,6 +1441,8 @@ namespace Barotrauma.Networking
msg.Write((byte)ClientPermissions.Ban); msg.Write((byte)ClientPermissions.Ban);
msg.Write(kickedName); msg.Write(kickedName);
msg.Write(reason); msg.Write(reason);
msg.Write(range);
msg.Write(duration.HasValue ? duration.Value.TotalSeconds : 0.0); //0 = permaban
client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered); client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
} }
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+11 -1
View File
@@ -780,11 +780,21 @@ namespace Barotrauma.Networking
case ClientPermissions.Ban: case ClientPermissions.Ban:
string bannedName = inc.ReadString().ToLowerInvariant(); string bannedName = inc.ReadString().ToLowerInvariant();
string banReason = inc.ReadString(); string banReason = inc.ReadString();
bool range = inc.ReadBoolean();
double durationSeconds = inc.ReadDouble();
var bannedClient = connectedClients.Find(cl => cl != sender && cl.Name.ToLowerInvariant() == bannedName); var bannedClient = connectedClients.Find(cl => cl != sender && cl.Name.ToLowerInvariant() == bannedName);
if (bannedClient != null) if (bannedClient != null)
{ {
Log("Client \"" + sender.Name + "\" banned \"" + bannedClient.Name + "\".", ServerLog.MessageType.ServerMessage); Log("Client \"" + sender.Name + "\" banned \"" + bannedClient.Name + "\".", ServerLog.MessageType.ServerMessage);
BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? "Banned by " + sender.Name : banReason, false); if (durationSeconds > 0)
{
BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? "Banned by " + sender.Name : banReason, range, TimeSpan.FromSeconds(durationSeconds));
}
else
{
BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? "Banned by " + sender.Name : banReason, range);
}
} }
break; break;
case ClientPermissions.EndRound: case ClientPermissions.EndRound: