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

Fix compile errors from the merge.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-05 10:19:27 +10:00
parent 3789d2e419
commit 60e3a71611
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/Economy/CmdBalance.cs
View File

@ -30,7 +30,7 @@ namespace MCGalaxy.Commands {
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
if (CheckSuper(p, message, "player name")) return; if (CheckSuper(p, message, "player name")) return;
if (!ValidName(p, message, "player")) return; if (!Formatter.ValidName(p, message, "player")) return;
int matches = 1; int matches = 1;
Player who = message == "" ? p : PlayerInfo.FindMatches(p, message, out matches); Player who = message == "" ? p : PlayerInfo.FindMatches(p, message, out matches);
if (matches > 1) return; if (matches > 1) return;

10
Commands/Moderation/CmdPlayerEditDB.cs
View File

@ -32,12 +32,10 @@ namespace MCGalaxy.Commands {
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
if (message == "") { Help(p); return; } if (message == "") { Help(p); return; }
string[] args = message.SplitSpaces(3); string[] args = message.SplitSpaces(3);
Player who = PlayerInfo.Find(args[0]); args[0] = PlayerInfo.FindMatchesPreferOnline(p, args[0]);
if (who == null) {
string target = PlayerInfo.FindOfflineNameMatches(p, args[0]); if (args[0] == null) return;
if (target == null) return; Player who = PlayerInfo.FindExact(args[0]);
args[0] = target;
}
if (args.Length == 1) { if (args.Length == 1) {
Player.Message(p, Colors.red + "You must specify a type to modify."); Player.Message(p, Colors.red + "You must specify a type to modify.");
MessageValidTypes(p); return; MessageValidTypes(p); return;

4
Commands/Moderation/CmdUnban.cs
View File

@ -31,10 +31,10 @@ namespace MCGalaxy.Commands.Moderation {
Player who = PlayerInfo.Find(args[0]); Player who = PlayerInfo.Find(args[0]);
string name = who == null ? args[0] : who.name; string name = who == null ? args[0] : who.name;
string reason = args.Length > 1 ? args[1] : "(none given)"; string reason = args.Length > 1 ? args[1] : "(none given)";
Unban(p, name, who, reason); Unban(p, name, reason);
} }
void Unban(Player p, string name, Player who, string reason) { void Unban(Player p, string name, string reason) {
string srcFull = p == null ? "(console)" : p.ColoredName + "%S"; string srcFull = p == null ? "(console)" : p.ColoredName + "%S";
string src = p == null ? "(console)" : p.name; string src = p == null ? "(console)" : p.name;
Group banned = Group.findPerm(LevelPermission.Banned); Group banned = Group.findPerm(LevelPermission.Banned);