From c2a318ea1dada336020763230f02fc0f1cc94deb Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 2 Aug 2016 19:51:32 +1000 Subject: [PATCH] Now do partial rank name matching in /viewranks --- Commands/Information/CmdViewRanks.cs | 4 ++-- Commands/World/CmdSpawn.cs | 2 +- Economy/RankItem.cs | 2 +- Games/TntWars/TntWars.cs | 4 ++-- util/Formatter.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Commands/Information/CmdViewRanks.cs b/Commands/Information/CmdViewRanks.cs index 9050563db..e9f1ffc59 100644 --- a/Commands/Information/CmdViewRanks.cs +++ b/Commands/Information/CmdViewRanks.cs @@ -34,8 +34,8 @@ namespace MCGalaxy.Commands { public override void Use(Player p, string message) { if (message == "") { Player.Message(p, "Available ranks: " + Group.concatList()); return; } Group grp = message.CaselessEq("banned") ? - Group.findPerm(LevelPermission.Banned) : Group.Find(message); - if (grp == null) { Player.Message(p, "Could not find group"); return; } + Group.findPerm(LevelPermission.Banned) : Group.FindMatches(p, message); + if (grp == null) return; string list = grp.playerList.All().Join(", "); if (list.Length == 0) { diff --git a/Commands/World/CmdSpawn.cs b/Commands/World/CmdSpawn.cs index 478c6699a..f3d837fad 100644 --- a/Commands/World/CmdSpawn.cs +++ b/Commands/World/CmdSpawn.cs @@ -18,7 +18,7 @@ using MCGalaxy.Games; namespace MCGalaxy.Commands { - public sealed class CmdSpawn : Command { + public sealed class CmdSpawn : Command { public override string name { get { return "spawn"; } } public override string shortcut { get { return ""; } } public override string type { get { return CommandTypes.World; } } diff --git a/Economy/RankItem.cs b/Economy/RankItem.cs index 644d9dbf4..cc4b689da 100644 --- a/Economy/RankItem.cs +++ b/Economy/RankItem.cs @@ -161,7 +161,7 @@ namespace MCGalaxy.Eco { int lasttrueprice = 0; foreach (Group group in Group.GroupList) { if (group.Permission > Group.Find(MaxRank).Permission) break; - if (group.Permission <= Group.Find(Server.defaultRank).Permission) continue; + if (group.Permission <= Group.standard.Permission) continue; Rank rank = FindRank(group.name); if (rank == null) { diff --git a/Games/TntWars/TntWars.cs b/Games/TntWars/TntWars.cs index fc30d51d2..e09d3f1bf 100644 --- a/Games/TntWars/TntWars.cs +++ b/Games/TntWars/TntWars.cs @@ -121,8 +121,8 @@ namespace MCGalaxy.Games } //Map stuff lvl.setPhysics(3); - lvl.permissionbuild = Group.Find(Server.defaultRank).Permission; - lvl.permissionvisit = Group.Find(Server.defaultRank).Permission; + lvl.permissionbuild = Group.standard.Permission; + lvl.permissionvisit = Group.standard.Permission; lvl.Killer = true; //Seting Up Some Player stuff { diff --git a/util/Formatter.cs b/util/Formatter.cs index 6c8d7b3d8..d5f0ab47c 100644 --- a/util/Formatter.cs +++ b/util/Formatter.cs @@ -99,7 +99,7 @@ namespace MCGalaxy { public static void MessageBlock(Player p, string action, byte block) { StringBuilder builder = new StringBuilder("Only "); Block.Blocks perms = Block.BlockList[block]; - Formatter.PrintRanks(perms.lowestRank, perms.allow, perms.disallow, builder); + PrintRanks(perms.lowestRank, perms.allow, perms.disallow, builder); builder.Append( " %Scan ").Append(action); builder.Append(Block.Name(block)).Append(".");