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

Combine /whois and /whowas into one command.

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-04 21:22:46 +10:00
parent 4b48206838
commit f87cf85ac9
4 changed files with 55 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Commands/CommandKeywords.cs
View File

@ -258,7 +258,6 @@ namespace MCGalaxy.Commands {
new CommandKeywords((new CmdWhitelist()), "white list allow acces server"); new CommandKeywords((new CmdWhitelist()), "white list allow acces server");
new CommandKeywords((new CmdWhoip()), "who ip info"); new CommandKeywords((new CmdWhoip()), "who ip info");
new CommandKeywords((new CmdWhois()), "who player info"); new CommandKeywords((new CmdWhois()), "who player info");
new CommandKeywords((new CmdWhowas()), "who player info");
new CommandKeywords((new CmdWrite()), "block text"); new CommandKeywords((new CmdWrite()), "block text");
new CommandKeywords((new CmdWriteText()), "block text"); new CommandKeywords((new CmdWriteText()), "block text");
new CommandKeywords((new CmdXban()), "ban undo admin"); new CommandKeywords((new CmdXban()), "ban undo admin");

67
Commands/Information/CmdWhois.cs
View File

@ -1,7 +1,7 @@
/* /*
Copyright 2010 MCSharp team (Modified for use with MCZall/MCLawl/MCGalaxy) Copyright 2010 MCSharp team (Modified for use with MCZall/MCLawl/MCGalaxy)
Dual-licensed under the Educational Community License, Version 2.0 and Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at obtain a copy of the Licenses at
@ -16,29 +16,46 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using MCGalaxy.Games;
namespace MCGalaxy.Commands { namespace MCGalaxy.Commands {
public sealed class CmdWhois : Command { public sealed class CmdWhois : Command {
public override string name { get { return "whois"; } } public override string name { get { return "whois"; } }
public override string shortcut { get { return ""; } } public override string shortcut { get { return "whowas"; } }
public override string type { get { return CommandTypes.Information; } } public override string type { get { return CommandTypes.Information; } }
public override bool museumUsable { get { return true; } } public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } }
public override CommandPerm[] AdditionalPerms { public override CommandPerm[] AdditionalPerms {
get { return new[] { new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank which can see a player's ip and if whitelisted") }; } get { return new[] { new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank which can see IPs and if whitelisted") }; }
} }
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
Player who = message == "" ? p : PlayerInfo.Find(message);
if (message == "") message = p.name; if (message == "") message = p.name;
if (who == null || !Entities.CanSee(p, who)) { int matches;
Player.SendMessage(p, "\"" + message + "\" is offline! Using /whowas instead."); Player pl = PlayerInfo.FindOrShowMatches(p, message, out matches);
Command.all.Find("whowas").Use(p, message); return; if (matches > 1) return;
}
WhoInfo info;
if (matches == 1) {
info = FromOnline(pl);
} else {
if (!Player.ValidName(message)) { Player.SendMessage(p, "\"" + message + "\" is not a valid player name."); return; }
Player.SendMessage(p, "Searching the database for the player..");
OfflinePlayer target = PlayerInfo.FindOffline(message, true);
if (target == null) {
Player.SendMessage(p, "\"" + message + "\" was not found in the database.");
Player.SendMessage(p, "Note you must use a player's full account name."); return;
}
info = FromOffline(target, message);
}
WhoInfo.Output(p, info, CheckAdditionalPerm(p));
}
WhoInfo FromOnline(Player who) {
WhoInfo info = new WhoInfo(); WhoInfo info = new WhoInfo();
string prefix = who.title == "" ? "" : "[" + who.titlecolor + who.title + who.color + "] "; string prefix = who.title == "" ? "" : who.color + "[" + who.titlecolor + who.title + who.color + "] ";
info.FullName = prefix + who.ColoredName; info.FullName = prefix + who.ColoredName;
info.Name = who.name; info.Name = who.name;
info.Group = who.group; info.Group = who.group;
@ -53,11 +70,37 @@ namespace MCGalaxy.Commands {
info.RoundsMax = who.Game.MaxRoundsSurvived; info.RoundsMax = who.Game.MaxRoundsSurvived;
info.InfectedTotal = who.Game.TotalInfected; info.InfectedTotal = who.Game.TotalInfected;
info.InfectedMax = who.Game.MaxInfected; info.InfectedMax = who.Game.MaxInfected;
WhoInfo.Output(p, info, CheckAdditionalPerm(p)); return info;
} }
WhoInfo FromOffline(OfflinePlayer target, string message) {
Group group = Group.Find(Group.findPlayer(message));
string color = target.color == "" ? group.color : target.color;
string prefix = target.title == "" ? "" : color + "[" + target.titleColor + target.title + color + "] ";
WhoInfo info = new WhoInfo();
info.FullName = prefix + color + target.name.TrimEnd('+');
info.Name = target.name;
info.Group = group;
info.Money = int.Parse(target.money); info.Deaths = int.Parse(target.deaths);
info.TotalBlocks = long.Parse(target.blocks); info.LoginBlocks = -1;
info.TimeSpent = target.totalTime.ParseDBTime();
info.First = DateTime.Parse(target.firstLogin);
info.Last = DateTime.Parse(target.lastLogin);
info.Logins = int.Parse(target.logins); info.Kicks = int.Parse(target.kicks);
info.IP = target.ip;
if (Server.zombie.Running) {
ZombieStats stats = Server.zombie.LoadZombieStats(target.name);
info.RoundsTotal = stats.TotalRounds; info.InfectedTotal = stats.TotalInfected;
info.RoundsMax = stats.MaxRounds; info.InfectedMax = stats.MaxInfected;
}
return info;
}
public override void Help(Player p) { public override void Help(Player p) {
Player.SendMessage(p, "/whois [player] - Displays information about someone."); Player.SendMessage(p, "%T/whois [name] %H- Displays information about that player.");
Player.SendMessage(p, "%HNote this works for both online and offline players.");
} }
} }
} }

78
Commands/Information/CmdWhowas.cs
View File

@ -1,78 +0,0 @@
/*
Copyright 2010 MCSharp team (Modified for use with MCZall/MCLawl/MCGalaxy)
Dual-licensed under the Educational Community License, Version 2.0 and
the GNU General Public License, Version 3 (the "Licenses"); you may
not use this file except in compliance with the Licenses. You may
obtain a copy of the Licenses at
http://www.opensource.org/licenses/ecl2.php
http://www.gnu.org/licenses/gpl-3.0.html
Unless required by applicable law or agreed to in writing,
software distributed under the Licenses are distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the Licenses for the specific language governing
permissions and limitations under the Licenses.
*/
using System;
using MCGalaxy.Games;
namespace MCGalaxy.Commands {
public sealed class CmdWhowas : Command {
public override string name { get { return "whowas"; } }
public override string shortcut { get { return ""; } }
public override string type { get { return CommandTypes.Information; } }
public override bool museumUsable { get { return true; } }
public override LevelPermission defaultRank { get { return LevelPermission.Banned; } }
public override CommandPerm[] AdditionalPerms {
get { return new[] { new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank which can see a player's ip and if whitelisted") }; }
}
public override void Use(Player p, string message) {
if (message == "") { Help(p); return; }
int matches;
Player pl = PlayerInfo.FindOrShowMatches(p, message, out matches);
if (matches > 1) return;
if (matches == 1) {
Player.SendMessage(p, pl.color + pl.name + " %Sis online, using /whois instead.");
Command.all.Find("whois").Use(p, message); return;
}
if (!Player.ValidName(message)) { Player.SendMessage(p, "\"" + message + "\" is not a valid player name."); return; }
OfflinePlayer target = PlayerInfo.FindOffline(message, true);
if (target == null) {
Player.SendMessage(p, "\"" + message + "\" was not found in the database.");
Player.SendMessage(p, "Note you must use a player's full account name."); return;
}
Group group = Group.Find(Group.findPlayer(message));
string color = target.color == "" ? group.color : target.color;
string prefix = target.title == "" ? "" : "[" + target.titleColor + target.title + color + "] ";
WhoInfo info = new WhoInfo();
info.FullName = prefix + color + target.name.TrimEnd('+');
info.Name = target.name;
info.Group = group;
info.Money = int.Parse(target.money); info.Deaths = int.Parse(target.deaths);
info.TotalBlocks = long.Parse(target.blocks); info.LoginBlocks = -1;
info.TimeSpent = target.totalTime.ParseDBTime();
info.First = DateTime.Parse(target.firstLogin);
info.Last = DateTime.Parse(target.lastLogin);
info.Logins = int.Parse(target.logins); info.Kicks = int.Parse(target.kicks);
info.IP = target.ip;
if (Server.zombie.Running) {
ZombieStats stats = Server.zombie.LoadZombieStats(target.name);
info.RoundsTotal = stats.TotalRounds; info.InfectedTotal = stats.TotalInfected;
info.RoundsMax = stats.MaxRounds; info.InfectedMax = stats.MaxInfected;
}
WhoInfo.Output(p, info, CheckAdditionalPerm(p));
}
public override void Help(Player p) {
Player.SendMessage(p, "/whowas <name> - Displays information about an offline player.");
}
}
}

1
MCGalaxy_.csproj
View File

@ -255,7 +255,6 @@
<Compile Include="Commands\Information\CmdWhoip.cs" /> <Compile Include="Commands\Information\CmdWhoip.cs" />
<Compile Include="Commands\Information\CmdWhois.cs" /> <Compile Include="Commands\Information\CmdWhois.cs" />
<Compile Include="Commands\Information\CmdWhoNick.cs" /> <Compile Include="Commands\Information\CmdWhoNick.cs" />
<Compile Include="Commands\Information\CmdWhowas.cs" />
<Compile Include="Commands\Information\WhoInfo.cs" /> <Compile Include="Commands\Information\WhoInfo.cs" />
<Compile Include="Commands\Moderation\CmdAllowGuns.cs" /> <Compile Include="Commands\Moderation\CmdAllowGuns.cs" />
<Compile Include="Commands\Moderation\CmdBan.cs" /> <Compile Include="Commands\Moderation\CmdBan.cs" />