From 39733a116d8b21e1c3e79643dd99c25445daf569 Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Sat, 2 Dec 2017 20:59:30 -0700
Subject: [PATCH] Fix issue where temp bans were stored incorrectly

Bans were being stored as seconds, should be a DateTime in s format
with seconds added on to existing time.
---
 TShockAPI/Commands.cs | 6 +++---
 TShockAPI/TShock.cs   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 461af221..8abcbedd 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1368,7 +1368,7 @@ namespace TShockAPI
 
 							targetGeneralizedName = target.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.
 							if (success)
@@ -1398,7 +1398,7 @@ namespace TShockAPI
 							if (r.IsMatch(args.Parameters[1])) {
 								targetGeneralizedName = "IP: " + args.Parameters[1];
 								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)
 								{
 									args.Player.SendSuccessMessage("Target IP {0} was banned successfully.", targetGeneralizedName);
@@ -1447,7 +1447,7 @@ namespace TShockAPI
 							success = 
 								TShock.Bans.AddBan2(lastIP,
 									"", offlineUser.UUID, offlineUser.Name, banReason, false, args.Player.User.Name,
-									banLengthInSeconds == 0 ? "" : banLengthInSeconds.ToString());
+									banLengthInSeconds == 0 ? "" : DateTime.UtcNow.AddSeconds(banLengthInSeconds).ToString("s"));
 						}
 
 						if (success)
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index f808ce44..e4fdf0ff 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1387,7 +1387,7 @@ namespace TShockAPI
 					DateTime exp;
 					if (!DateTime.TryParse(ban.Expiration, out exp))
 					{
-						player.Disconnect("You are banned forever: " + ban.Reason);
+						player.Disconnect("Permanently banned for: " + ban.Reason);
 					}
 					else
 					{