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

Build 0.21.6.0

Browse Source
This commit is contained in:
Markus Isberg
2023-01-31 18:01:29 +02:00
parent 697ec52120
commit 25fa5a9552
145 changed files with 2317 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Networking/BanList.cs
+35 -18
View File
@@ -11,10 +11,10 @@ namespace Barotrauma.Networking
{
private static UInt32 LastIdentifier = 0;
public bool Expired => ExpirationTime is { } expirationTime && DateTime.Now > expirationTime;
public bool Expired => ExpirationTime.TryUnwrap(out var expirationTime) && SerializableDateTime.LocalNow > expirationTime;
public BannedPlayer(
string name, Either<Address, AccountId> addressOrAccountId, string reason, DateTime? expirationTime)
string name, Either<Address, AccountId> addressOrAccountId, string reason, Option<SerializableDateTime> expirationTime)
{
this.Name = name;
this.AddressOrAccountId = addressOrAccountId;
@@ -39,6 +39,7 @@ namespace Barotrauma.Networking
{
LoadBanList();
}
RemoveExpired();
}
private void LoadLegacyBanList()
@@ -69,7 +70,7 @@ namespace Barotrauma.Networking
{
if (DateTime.TryParse(separatedLine[2], out DateTime parsedTime))
{
expirationTime = parsedTime;
expirationTime = DateTime.SpecifyKind(parsedTime, DateTimeKind.Local);
}
else
{
@@ -80,15 +81,18 @@ namespace Barotrauma.Networking
}
string reason = separatedLine.Length > 3 ? string.Join(",", separatedLine.Skip(3)) : "";
if (expirationTime.HasValue && DateTime.Now > expirationTime.Value) { continue; }
var serializableExpirationTime
= expirationTime.HasValue
? Option<SerializableDateTime>.Some(new SerializableDateTime(expirationTime.Value))
: Option<SerializableDateTime>.None();
if (AccountId.Parse(endpointStr).TryUnwrap(out var accountId))
{
bannedPlayers.Add(new BannedPlayer(name, accountId, reason, expirationTime));
bannedPlayers.Add(new BannedPlayer(name, accountId, reason, serializableExpirationTime));
}
else if (Address.Parse(endpointStr).TryUnwrap(out var address))
{
bannedPlayers.Add(new BannedPlayer(name, address, reason, expirationTime));
bannedPlayers.Add(new BannedPlayer(name, address, reason, serializableExpirationTime));
}
}
@@ -109,10 +113,22 @@ namespace Barotrauma.Networking
var name = element.GetAttributeString("name", "")!;
var reason = element.GetAttributeString("reason", "")!;
DateTime? expirationTime = DateTime.FromBinary(unchecked((long)element.GetAttributeUInt64("expirationtime", 0)));
if (expirationTime < DateTime.Now) { expirationTime = null; }
var expirationTime = Option<SerializableDateTime>.None();
var expirationTimeStr = element.GetAttributeString("expirationtime", "")!;
if (UInt64.TryParse(expirationTimeStr, out var binaryDateTime) && binaryDateTime > 0)
{
// Backwards compatibility: if expirationtime is stored as an int,
// convert to SerializableDateTime with local timezone because
// banlists used to assume local time
expirationTime = Option<SerializableDateTime>.Some(
new SerializableDateTime(
DateTime.FromBinary((long)binaryDateTime),
SerializableTimeZone.LocalTimeZone));
}
expirationTime = expirationTime.Fallback(SerializableDateTime.Parse(expirationTimeStr));
if (accountId.IsNone() && address.IsNone()) { return Option<BannedPlayer>.None(); }
Either<Address, AccountId> addressOrAccountId = accountId.TryUnwrap(out var accId)
@@ -171,14 +187,14 @@ namespace Barotrauma.Networking
string logMsg = "Banned " + name;
if (!string.IsNullOrEmpty(reason)) { logMsg += ", reason: " + reason; }
if (duration.HasValue) { logMsg += ", duration: " + duration.Value.ToString(); }
if (duration.HasValue) { logMsg += ", duration: " + duration.Value; }
DebugConsole.Log(logMsg);
DateTime? expirationTime = null;
Option<SerializableDateTime> expirationTime = Option<SerializableDateTime>.None();
if (duration.HasValue)
{
expirationTime = DateTime.Now + duration.Value;
expirationTime = Option<SerializableDateTime>.Some(new SerializableDateTime(DateTime.Now + duration.Value));
}
bannedPlayers.Add(new BannedPlayer(name, addressOrAccountId, reason, expirationTime));
@@ -232,9 +248,10 @@ namespace Barotrauma.Networking
{
retVal.SetAttributeValue("address", address.StringRepresentation);
}
if (bannedPlayer.ExpirationTime is { } expirationTime)
if (bannedPlayer.ExpirationTime.TryUnwrap(out var expirationTime))
{
retVal.SetAttributeValue("expirationtime", unchecked((ulong)expirationTime.ToBinary()));
#warning TODO: stop writing binary DateTime representation after this gets on main
retVal.SetAttributeValue("expirationtime", expirationTime.ToLocalValue().ToBinary());
}
return retVal;
@@ -269,11 +286,11 @@ namespace Barotrauma.Networking
outMsg.WriteString(bannedPlayer.Name);
outMsg.WriteUInt32(bannedPlayer.UniqueIdentifier);
outMsg.WriteBoolean(bannedPlayer.ExpirationTime != null);
outMsg.WriteBoolean(bannedPlayer.ExpirationTime.IsSome());
outMsg.WritePadBits();
if (bannedPlayer.ExpirationTime != null)
if (bannedPlayer.ExpirationTime.TryUnwrap(out var expirationTime))
{
double hoursFromNow = (bannedPlayer.ExpirationTime.Value - DateTime.Now).TotalHours;
double hoursFromNow = (expirationTime.ToUtcValue() - DateTime.UtcNow).TotalHours;
outMsg.WriteDouble(hoursFromNow);
}
Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+12 -5
View File
@@ -140,6 +140,7 @@ namespace Barotrauma.Networking
ServerSettings = new ServerSettings(this, name, port, queryPort, maxPlayers, isPublic, attemptUPnP);
KarmaManager.SelectPreset(ServerSettings.KarmaPreset);
ServerSettings.SetPassword(password);
ServerSettings.SaveSettings();
Voting = new Voting();
@@ -3227,16 +3228,16 @@ namespace Barotrauma.Networking
}
//too far to hear the msg -> don't send
if (string.IsNullOrWhiteSpace(modifiedMessage)) continue;
if (string.IsNullOrWhiteSpace(modifiedMessage)) { continue; }
}
break;
case ChatMessageType.Dead:
//character still alive -> don't send
if (client != senderClient && client.Character != null && !client.Character.IsDead) continue;
if (client != senderClient && client.Character != null && !client.Character.IsDead) { continue; }
break;
case ChatMessageType.Private:
//private msg sent to someone else than this client -> don't send
if (client != targetClient && client != senderClient) continue;
if (client != targetClient && client != senderClient) { continue; }
break;
}
@@ -3272,11 +3273,17 @@ namespace Barotrauma.Networking
//too far to hear the msg -> don't send
if (!client.Character.CanHearCharacter(message.Sender)) { continue; }
}
SendDirectChatMessage(new OrderChatMessage(message.Order, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder), client);
SendDirectChatMessage(new OrderChatMessage(message.Order, message.Text, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder), client);
}
if (!string.IsNullOrWhiteSpace(message.Text))
{
AddChatMessage(new OrderChatMessage(message.Order, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder));
AddChatMessage(new OrderChatMessage(message.Order, message.Text, message.TargetCharacter, message.Sender, isNewOrder: message.IsNewOrder));
if (ChatMessage.CanUseRadio(message.Sender, out var senderRadio))
{
//send to chat-linked wifi components
Signal s = new Signal(message.Text, sender: message.Sender, source: senderRadio.Item);
senderRadio.TransmitSignal(s, sentFromChat: true);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Networking/OrderChatMessage.cs
+1
View File
@@ -10,6 +10,7 @@ namespace Barotrauma.Networking
segmentTable.StartNewSegment(ServerNetSegment.ChatMessage);
msg.WriteUInt16(NetStateID);
msg.WriteRangedInteger((int)ChatMessageType.Order, 0, Enum.GetValues(typeof(ChatMessageType)).Length - 1);
msg.WriteString(Text);
msg.WriteString(SenderName);
msg.WriteBoolean(SenderClient != null);
if (SenderClient != null)
Barotrauma/BarotraumaServer/ServerSource/Networking/Primitives/Peers/Server/ServerPeer.cs
+1 -1
View File
@@ -246,7 +246,7 @@ namespace Barotrauma.Networking
{
case ConnectionInitialization.ContentPackageOrder:
DateTime timeNow = DateTime.UtcNow;
SerializableDateTime timeNow = SerializableDateTime.UtcNow;
structToSend = new ServerPeerContentPackageOrderPacket
{
ServerName = GameMain.Server.ServerName,