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

Now /unban partially matches player names.

Browse Source
This commit is contained in:
UnknownShadow200 2016-07-28 23:13:15 +10:00
parent cb51be2d6a
commit 7116c49e8f
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Commands/Moderation/CmdUnban.cs
View File

@ -16,7 +16,6 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
namespace MCGalaxy.Commands { namespace MCGalaxy.Commands {
public sealed class CmdUnban : Command { public sealed class CmdUnban : Command {
public override string name { get { return "unban"; } } public override string name { get { return "unban"; } }
public override string shortcut { get { return ""; } } public override string shortcut { get { return ""; } }
@ -39,31 +38,34 @@ namespace MCGalaxy.Commands {
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;
if (!Group.IsBanned(name)) { // Check tempbans first
foreach (Server.TempBan tban in Server.tempBans) { foreach (Server.TempBan tban in Server.tempBans) {
if (!tban.name.CaselessEq(name)) continue; if (!tban.name.CaselessEq(name)) continue;
Server.tempBans.Remove(tban); Server.tempBans.Remove(tban);
Player.GlobalMessage(name + " had their temporary ban lifted by " + srcFull + "."); Player.GlobalMessage(name + " had their temporary ban lifted by " + srcFull + ".");
Server.s.Log("UNBANNED: " + name + " by " + src);
Server.IRC.Say(name + " was unbanned by " + src + ".");
return;
}
Player.Message(p, "Player \"" + name + "\" is not banned.");
} else {
Player.GlobalMessage(name + " was &8(unbanned) %Sby " + srcFull + ".");
Server.s.Log("UNBANNED: " + name + " by " + src); Server.s.Log("UNBANNED: " + name + " by " + src);
Server.IRC.Say(name + " was unbanned by " + src + "."); Server.IRC.Say(name + " was unbanned by " + src + ".");
return;
}
Ban.UnbanPlayer(p, name, reason); Group banned = Group.findPerm(LevelPermission.Banned);
Group.findPerm(LevelPermission.Banned).playerList.Remove(name); int matches = 0;
Group.findPerm(LevelPermission.Banned).playerList.Save(); name = banned.playerList.FindMatches(p, name, "banned players", out matches);
if (name == null) return;
if (who != null) { Player.GlobalMessage(name + " was &8(unbanned) %Sby " + srcFull + ".");
who.group = Group.standard; who.color = who.group.color; Server.s.Log("UNBANNED: " + name + " by " + src);
Entities.GlobalDespawn(who, false); Server.IRC.Say(name + " was unbanned by " + src + ".");
Entities.GlobalSpawn(who, false);
} Ban.UnbanPlayer(p, name, reason);
Group.findPerm(LevelPermission.Banned).playerList.Remove(name);
Group.findPerm(LevelPermission.Banned).playerList.Save();
if (who != null) {
who.group = Group.standard; who.color = who.group.color;
Entities.GlobalDespawn(who, false);
Entities.GlobalSpawn(who, false);
} }
string ip = PlayerInfo.FindIP(name); string ip = PlayerInfo.FindIP(name);

3
Levels/Level.cs
View File

@ -382,7 +382,8 @@ namespace MCGalaxy {
object locker = ThreadSafeCache.DBCache.Get(name); object locker = ThreadSafeCache.DBCache.Get(name);
lock (locker) { lock (locker) {
LevelDB.LoadZones(level, name); LevelDB.LoadZones(level, name);
LevelDB.LoadMetadata(level, name); LevelDB.LoadPortals(level, name);
LevelDB.LoadMessages(level, name);
} }
Server.s.Log(string.Format("Level \"{0}\" loaded.", level.name)); Server.s.Log(string.Format("Level \"{0}\" loaded.", level.name));

7
Player/List/PlayerList.cs
View File

@ -60,6 +60,13 @@ namespace MCGalaxy {
} }
} }
public string FindMatches(Player p, string name, string type, out int matches) {
lock (locker) {
return Extensions.FindMatches<string>(p, name, out matches, players,
n => true, n => n, type, 20);
}
}
public void Save() { Save(true); } public void Save() { Save(true); }
public void Save(bool console) { public void Save(bool console) {