AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-23 04:32:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove accidentally left in code for testing pull request

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-12 09:41:16 +10:00
parent 0c660598a8
commit 254518b32c
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MCGalaxy/Commands/Information/CmdWhois.cs
View File

@ -67,11 +67,8 @@ namespace MCGalaxy.Commands.Info {
info.TimeSpent = who.time; info.TimeOnline = DateTime.Now - who.timeLogged; info.TimeSpent = who.time; info.TimeOnline = DateTime.Now - who.timeLogged;
info.First = who.firstLogin; info.First = who.firstLogin;
info.Last = who.lastLogin;
info.TotalTimeOnline = DateTime.Now - who.firstLogin;
info.Logins = who.totalLogins; info.Kicks = who.totalKicked; info.Logins = who.totalLogins; info.Kicks = who.totalKicked;
info.IP = who.ip; info.AfkMessage = who.afkMessage; info.IP = who.ip; info.AfkMessage = who.afkMessage;
info.LastAction = who.LastAction;
info.IdleTime = DateTime.UtcNow - who.LastAction; info.IdleTime = DateTime.UtcNow - who.LastAction;
info.RoundsTotal = who.Game.TotalRoundsSurvived; info.RoundsTotal = who.Game.TotalRoundsSurvived;
@ -99,7 +96,6 @@ namespace MCGalaxy.Commands.Info {
info.TimeSpent = data.TotalTime.ParseDBTime(); info.TimeSpent = data.TotalTime.ParseDBTime();
info.First = data.FirstLogin; info.First = data.FirstLogin;
info.Last = data.LastLogin; info.Last = data.LastLogin;
info.TotalTime = data.LastLogin - data.FirstLogin;
info.Logins = data.Logins; info.Kicks = data.Kicks; info.Logins = data.Logins; info.Kicks = data.Kicks;
info.IP = data.IP; info.IP = data.IP;

29
MCGalaxy/Commands/Information/WhoInfo.cs
View File

@ -16,7 +16,6 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using MCGalaxy.Eco;
namespace MCGalaxy.Commands.Info { namespace MCGalaxy.Commands.Info {
class WhoInfo { class WhoInfo {
@ -24,11 +23,10 @@ namespace MCGalaxy.Commands.Info {
public Group Group; public Group Group;
public int Money, Deaths; public int Money, Deaths;
public long TotalBlocks, LoginBlocks, TotalDrawn, TotalPlaced, TotalDeleted; public long TotalBlocks, LoginBlocks, TotalDrawn, TotalPlaced, TotalDeleted;
public TimeSpan TimeSpent, TimeOnline, TotalTimeOnline, TotalTime; public TimeSpan TimeSpent, TimeOnline;
public DateTime First, Last, LastAction; public DateTime First, Last;
public int Logins, Kicks; public int Logins, Kicks;
public string IP; public string IP;
public string Status;
public int RoundsTotal, RoundsMax; public int RoundsTotal, RoundsMax;
public int InfectedTotal, InfectedMax; public int InfectedTotal, InfectedMax;
public TimeSpan IdleTime; public TimeSpan IdleTime;
@ -57,20 +55,14 @@ namespace MCGalaxy.Commands.Info {
who.TimeSpent.Shorten(), who.TimeOnline.Shorten()); who.TimeSpent.Shorten(), who.TimeOnline.Shorten());
else else
Player.Message(p, " Spent &a{0} %Son the server", who.TimeSpent.Shorten()); Player.Message(p, " Spent &a{0} %Son the server", who.TimeSpent.Shorten());
if (who.TotalTimeOnline.Ticks > 0)
Player.Message(p, " %Shas been a player on the server for &a{0} since &a{1}",
who.TotalTime.Shorten(), who.Last.ToString("dd-MM-yyyy hh:mm tt"));
else
Player.Message(p, " %Shas been a player on the server for &a{0}", who.TotalTimeOnline.Shorten());
if (who.Last.Ticks > 0) if (who.Last.Ticks > 0)
Player.Message(p, " First login &a" + who.First.ToString("dd-MM-yyyy hh:mm tt") Player.Message(p, " First login &a" + who.First.ToString("yyyy-MM-dd")
+ "%S, last login &a" + who.Last.ToString("dd-MM-yyyy hh:mm tt")); + "%S, last login &a" + who.Last.ToString("yyyy-MM-dd"));
else else
Player.Message(p, " First login on &a" + who.First.ToString("dd-MM-yyyy hh:mm tt") + Player.Message(p, " First login on &a" + who.First.ToString("yyyy-MM-dd")
"%S, and is currently &aonline"); + "%S, and is currently &aonline");
Player.Message(p, " Logged in &a{0} %Stimes, &c{1} %Sof which ended in a kick", who.Logins, who.Kicks); Player.Message(p, " Logged in &a{0} %Stimes, &c{1} %Sof which ended in a kick", who.Logins, who.Kicks);
if (who.Group.Permission == LevelPermission.Banned) { if (who.Group.Permission == LevelPermission.Banned) {
string[] data = Ban.GetBanData(who.Name); string[] data = Ban.GetBanData(who.Name);
@ -98,10 +90,9 @@ namespace MCGalaxy.Commands.Info {
} }
if (who.AfkMessage != null) { if (who.AfkMessage != null) {
Player.Message(p, " Idle for {0} (AFK {1}%S) last action was at {1}", who.IdleTime.Shorten(), who.AfkMessage, who.LastAction.ToString("dd-MM-yyyy hh:mm tt")); Player.Message(p, " Idle for {0} (AFK {1}%S)", who.IdleTime.Shorten(), who.AfkMessage);
Player.Message(p, " {0} (AFK {1}%S)", who.IdleTime.Shorten(), who.AfkMessage);
} else if (who.IdleTime.TotalMinutes >= 1) { } else if (who.IdleTime.TotalMinutes >= 1) {
Player.Message(p, " Idle for {0},last action was at {1}", who.IdleTime.Shorten(), who.LastAction.ToString("dd-MM-yyyy hh:mm tt")); Player.Message(p, " Idle for {0}", who.IdleTime.Shorten());
} }
if (!Server.zombie.Running) return; if (!Server.zombie.Running) return;