themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix issue where temp bans were stored incorrectly

Browse source 
Bans were being stored as seconds, should be a DateTime in s format
with seconds added on to existing time.
This commit is contained in:
Lucas Nicodemus 2017-12-02 20:59:30 -07:00
parent 35c61e53f1
commit 39733a116d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Commands.cs
View file

@ -1368,7 +1368,7 @@ namespace TShockAPI
targetGeneralizedName = target.Name; targetGeneralizedName = target.Name;
success = TShock.Bans.AddBan2(target.IP, target.Name, target.UUID, target.User.Name, banReason, false, args.Player.User.Name, success = TShock.Bans.AddBan2(target.IP, target.Name, target.UUID, target.User.Name, banReason, false, args.Player.User.Name,
banLengthInSeconds == 0 ? "" : banLengthInSeconds.ToString()); banLengthInSeconds == 0 ? "" : DateTime.UtcNow.AddSeconds(banLengthInSeconds).ToString("s"));
// Since this is an online ban, we need to dc the player and tell them now. // Since this is an online ban, we need to dc the player and tell them now.
if (success) if (success)
@ -1398,7 +1398,7 @@ namespace TShockAPI
if (r.IsMatch(args.Parameters[1])) { if (r.IsMatch(args.Parameters[1])) {
targetGeneralizedName = "IP: " + args.Parameters[1]; targetGeneralizedName = "IP: " + args.Parameters[1];
success = TShock.Bans.AddBan2(args.Parameters[1], "", "", "", banReason, success = TShock.Bans.AddBan2(args.Parameters[1], "", "", "", banReason,
false, args.Player.User.Name, banLengthInSeconds == 0 ? "" : banLengthInSeconds.ToString()); false, args.Player.User.Name, banLengthInSeconds == 0 ? "" : DateTime.UtcNow.AddSeconds(banLengthInSeconds).ToString("s"));
if (success && offlineUser != null) if (success && offlineUser != null)
{ {
args.Player.SendSuccessMessage("Target IP {0} was banned successfully.", targetGeneralizedName); args.Player.SendSuccessMessage("Target IP {0} was banned successfully.", targetGeneralizedName);
@ -1447,7 +1447,7 @@ namespace TShockAPI
success = success =
TShock.Bans.AddBan2(lastIP, TShock.Bans.AddBan2(lastIP,
"", offlineUser.UUID, offlineUser.Name, banReason, false, args.Player.User.Name, "", offlineUser.UUID, offlineUser.Name, banReason, false, args.Player.User.Name,
banLengthInSeconds == 0 ? "" : banLengthInSeconds.ToString()); banLengthInSeconds == 0 ? "" : DateTime.UtcNow.AddSeconds(banLengthInSeconds).ToString("s"));
} }
if (success) if (success)

2
TShockAPI/TShock.cs
View file

@ -1387,7 +1387,7 @@ namespace TShockAPI
DateTime exp; DateTime exp;
if (!DateTime.TryParse(ban.Expiration, out exp)) if (!DateTime.TryParse(ban.Expiration, out exp))
{ {
player.Disconnect("You are banned forever: " + ban.Reason); player.Disconnect("Permanently banned for: " + ban.Reason);
} }
else else
{ {