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

Renamed Ban.DateTime to Ban.BanDateTime because System.DateTime is a thing

Browse source 
Ban.BanDateTime and Ban.ExpirationDateTime are now actually set
This commit is contained in:
White 2017-02-21 21:42:50 +10:30
parent c3cffd1559
commit 3ec7cb1d09
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/DB/BanManager.cs
View file

@ -111,10 +111,10 @@ namespace TShockAPI.DB
switch (sortMethod) switch (sortMethod)
{ {
case BanSortMethod.AddedOldestToNewest: case BanSortMethod.AddedOldestToNewest:
comparer = (a, b) => b.DateTime.CompareTo(a.DateTime); comparer = (a, b) => b.BanDateTime.CompareTo(a.BanDateTime);
break; break;
case BanSortMethod.AddedNewestToOldest: case BanSortMethod.AddedNewestToOldest:
comparer = (a, b) => a.DateTime.CompareTo(b.DateTime); comparer = (a, b) => a.BanDateTime.CompareTo(b.BanDateTime);
break; break;
case BanSortMethod.ExpirationLatestToSoonest: case BanSortMethod.ExpirationLatestToSoonest:
comparer = (a, b) => b.ExpirationDateTime.CompareTo(a.ExpirationDateTime); comparer = (a, b) => b.ExpirationDateTime.CompareTo(a.ExpirationDateTime);
@ -334,7 +334,7 @@ namespace TShockAPI.DB
/// <summary> /// <summary>
/// Gets the <see cref="System.DateTime"/> object representation of the <see cref="Date"/> string. /// Gets the <see cref="System.DateTime"/> object representation of the <see cref="Date"/> string.
/// </summary> /// </summary>
public DateTime DateTime { get; } public DateTime BanDateTime { get; }
/// <summary> /// <summary>
/// Gets or sets the expiration date, in which the ban shall be lifted /// Gets or sets the expiration date, in which the ban shall be lifted
@ -366,6 +366,17 @@ namespace TShockAPI.DB
BanningUser = banner; BanningUser = banner;
Date = date; Date = date;
Expiration = exp; Expiration = exp;
DateTime d;
DateTime e;
if (DateTime.TryParse(Date, out d))
{
BanDateTime = d;
}
if (DateTime.TryParse(Expiration, out e))
{
ExpirationDateTime = e;
}
} }
/// <summary> /// <summary>