diff --git a/Commands/CPE/CmdModel.cs b/Commands/CPE/CmdModel.cs index e7c62d082..47b106c87 100644 --- a/Commands/CPE/CmdModel.cs +++ b/Commands/CPE/CmdModel.cs @@ -25,7 +25,7 @@ namespace MCGalaxy.Commands if (message.Split(' ').Length > 1) { - targetPlayer = Player.Find(message.Split(' ')[0].Trim()); + targetPlayer = PlayerInfo.Find(message.Split(' ')[0].Trim()); if (targetPlayer == null) { Player.SendMessage(p, "Player \"" + message.Split(' ')[0].Trim() + "\" does not exist"); @@ -46,7 +46,7 @@ namespace MCGalaxy.Commands p.model = model; } - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == targetPlayer.level && pl.HasCpeExt(CpeExt.ChangeModel)) { diff --git a/Commands/Chat/CmdChatRoom.cs b/Commands/Chat/CmdChatRoom.cs index f243c8399..6e88e2d67 100644 --- a/Commands/Chat/CmdChatRoom.cs +++ b/Commands/Chat/CmdChatRoom.cs @@ -131,7 +131,7 @@ namespace MCGalaxy.Commands { } if (!canDeleteForce) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl != p && pl.Chatroom == room) { Player.SendMessage(p, "Sorry, someone else is in the chatroom"); return; @@ -144,7 +144,7 @@ namespace MCGalaxy.Commands { HandleLeave(p); Server.Chatrooms.Remove(room); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.Chatroom == room) { pl.Chatroom = null; Player.SendMessage(pl, "You left the chatroom '" + room + "' because it is being deleted"); @@ -199,7 +199,7 @@ namespace MCGalaxy.Commands { } string name = parts[1], room = parts[2]; - Player pl = Player.Find(name); + Player pl = PlayerInfo.Find(name); if (pl == null) { Player.SendMessage(p, "There is no online player with the name '" + name + "'"); return; @@ -236,7 +236,7 @@ namespace MCGalaxy.Commands { } string name = parts[1]; - Player pl = Player.Find(name); + Player pl = PlayerInfo.Find(name); if (pl == null) { Player.SendMessage(p, "There is no online player with the name '" + name + "'"); return; @@ -272,7 +272,7 @@ namespace MCGalaxy.Commands { string room = parts[0]; if (Server.Chatrooms.Contains(room)) { Player.SendMessage(p, "Players in room '" + room + "' :"); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.Chatroom == room) Player.SendMessage(p, pl.color + pl.name); } diff --git a/Commands/Chat/CmdGlobalCLS.cs b/Commands/Chat/CmdGlobalCLS.cs index dce40c6cb..ee8eb872f 100644 --- a/Commands/Chat/CmdGlobalCLS.cs +++ b/Commands/Chat/CmdGlobalCLS.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands int i = 0; for (i = 0; i < 20; i++) { - Player.players.ForEach(delegate(Player p1) { BlankMessage(p1); }); + PlayerInfo.players.ForEach(delegate(Player p1) { BlankMessage(p1); }); } Player.GlobalMessage("%4Global Chat Cleared."); } diff --git a/Commands/Chat/CmdHigh5.cs b/Commands/Chat/CmdHigh5.cs index 26af93d8d..f300f4f7d 100644 --- a/Commands/Chat/CmdHigh5.cs +++ b/Commands/Chat/CmdHigh5.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || who.hidden) { Player.SendMessage(p, "Could not find player specified."); return; } diff --git a/Commands/Chat/CmdHug.cs b/Commands/Chat/CmdHug.cs index 13b8ef8b6..1843180ad 100644 --- a/Commands/Chat/CmdHug.cs +++ b/Commands/Chat/CmdHug.cs @@ -29,7 +29,7 @@ namespace MCGalaxy public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || who.hidden) { Player.SendMessage(p, "Could not find player specified."); return; } diff --git a/Commands/Chat/CmdIgnore.cs b/Commands/Chat/CmdIgnore.cs index f72de2cd8..e6b4e8e27 100644 --- a/Commands/Chat/CmdIgnore.cs +++ b/Commands/Chat/CmdIgnore.cs @@ -59,7 +59,7 @@ namespace MCGalaxy.Commands } return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); if (who == null) { Player.SendMessage(p, "Could not find player specified!"); diff --git a/Commands/Chat/CmdRankMsg.cs b/Commands/Chat/CmdRankMsg.cs index 5d337e605..aea3ce717 100644 --- a/Commands/Chat/CmdRankMsg.cs +++ b/Commands/Chat/CmdRankMsg.cs @@ -57,7 +57,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "Could not find group specified!"); return; } - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.group.name == findgroup.name) { diff --git a/Commands/Chat/CmdWhisper.cs b/Commands/Chat/CmdWhisper.cs index 82903f0f7..60da55cb1 100644 --- a/Commands/Chat/CmdWhisper.cs +++ b/Commands/Chat/CmdWhisper.cs @@ -36,7 +36,7 @@ namespace MCGalaxy.Commands } else { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { p.whisperTo = ""; p.whisper = false; Player.SendMessage(p, "Could not find player."); return; } if (who.hidden) { diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index 1e20ac788..7cd6a8aeb 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -86,7 +86,7 @@ namespace MCGalaxy.Commands } else if (cmd == "ZONE") { HandleZoneCommand(p, arg, arg2); } else if (cmd == "KICKALL") { - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player pl) { if (pl.level == p.level && pl.name != p.name) @@ -98,7 +98,7 @@ namespace MCGalaxy.Commands return; } - Player kicked = Player.Find(arg); + Player kicked = PlayerInfo.Find(arg); if (kicked == null) { p.SendMessage("Error: Player not found."); } else { @@ -296,7 +296,7 @@ namespace MCGalaxy.Commands if (value == "") { Player.SendMessage(p, "You did not specify a name to blacklist from your map."); return; } - Player blocked = Player.Find(value); + Player blocked = PlayerInfo.Find(value); if (blocked.name.StartsWith(p.name)) { Player.SendMessage(p, "You can't blacklist yourself"); return; } if (blocked == null) { Player.SendMessage(p, "Cannot find player."); return; } diff --git a/Commands/CmdVoteResults.cs b/Commands/CmdVoteResults.cs index e681508db..d8deadcfc 100644 --- a/Commands/CmdVoteResults.cs +++ b/Commands/CmdVoteResults.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { Player who = null; - if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } + if (message == "") { who = p; message = p.name; } else { who = PlayerInfo.Find(message); } if (Server.YesVotes >= 1 || Server.NoVotes >= 1) { Player.SendMessage(p, Colors.green + "Y: " + Server.YesVotes + Colors.red + " N: " + Server.NoVotes); diff --git a/Commands/Economy/CmdAward.cs b/Commands/Economy/CmdAward.cs index fc26c6b26..50f35a2e7 100644 --- a/Commands/Economy/CmdAward.cs +++ b/Commands/Economy/CmdAward.cs @@ -43,7 +43,7 @@ namespace MCGalaxy.Commands } string foundPlayer = message.Split(' ')[0]; - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who != null) foundPlayer = who.name; string awardName = message.Substring(message.IndexOf(' ') + 1); if (!Awards.awardExists(awardName)) diff --git a/Commands/Economy/CmdAwards.cs b/Commands/Economy/CmdAwards.cs index 98bed9adc..d41fc7189 100644 --- a/Commands/Economy/CmdAwards.cs +++ b/Commands/Economy/CmdAwards.cs @@ -42,7 +42,7 @@ namespace MCGalaxy.Commands if (message.Split(' ').Length == 2) { foundPlayer = message.Split(' ')[0]; - Player who = Player.Find(foundPlayer); + Player who = PlayerInfo.Find(foundPlayer); if (who != null) foundPlayer = who.name; try { @@ -65,14 +65,14 @@ namespace MCGalaxy.Commands catch { foundPlayer = message; - Player who = Player.Find(foundPlayer); + Player who = PlayerInfo.Find(foundPlayer); if (who != null) foundPlayer = who.name; } } else { foundPlayer = message; - Player who = Player.Find(foundPlayer); + Player who = PlayerInfo.Find(foundPlayer); if (who != null) foundPlayer = who.name; } } diff --git a/Commands/Economy/CmdEconomy.cs b/Commands/Economy/CmdEconomy.cs index 81eb755fe..f2de92a62 100644 --- a/Commands/Economy/CmdEconomy.cs +++ b/Commands/Economy/CmdEconomy.cs @@ -544,7 +544,7 @@ namespace MCGalaxy.Commands { case "amount": Economy.EcoStats ecostats; if (par1 != string.Empty && par1 != null && par1 != "") { - Player who = Player.Find(par1); //is player online? + Player who = PlayerInfo.Find(par1); //is player online? if (who == null) { //player is offline ecostats = Economy.RetrieveEcoStats(par1); Player.SendMessage(p, "%3===Economy stats for: %f" + ecostats.playerName + "%7(offline)%3==="); diff --git a/Commands/Economy/CmdFakePay.cs b/Commands/Economy/CmdFakePay.cs index a84d340c1..e135692d4 100644 --- a/Commands/Economy/CmdFakePay.cs +++ b/Commands/Economy/CmdFakePay.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands var split = message.Split(' '); - Player who = Player.Find(split[0]); + Player who = PlayerInfo.Find(split[0]); if (who == null) { Player.SendMessage(p, Server.DefaultColor + "Player not found!"); diff --git a/Commands/Economy/CmdGive.cs b/Commands/Economy/CmdGive.cs index 5b91b2bbd..57b2e3840 100644 --- a/Commands/Economy/CmdGive.cs +++ b/Commands/Economy/CmdGive.cs @@ -43,13 +43,13 @@ namespace MCGalaxy.Commands catch { Player.SendMessage(p, "%cInvalid amount"); return; } if (amountGiven < 0) { Player.SendMessage(p, "%cCannot give negative %3" + Server.moneys); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); Economy.EcoStats ecos; if (who == null) { //player is offline - Player.OfflinePlayer off = Player.FindOffline(message.Split()[0]); - if (off.name == "") { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } + OfflinePlayer off = PlayerInfo.FindOffline(message.Split()[0]); + if (off == null) { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } ecos = Economy.RetrieveEcoStats(message.Split()[0]); if (ReachedMax(p, ecos.money, amountGiven)) return; diff --git a/Commands/Economy/CmdMoney.cs b/Commands/Economy/CmdMoney.cs index e0e78fce2..6c08f6497 100644 --- a/Commands/Economy/CmdMoney.cs +++ b/Commands/Economy/CmdMoney.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands } else if (message.Split().Length == 1) { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { //player is offline Economy.EcoStats ecos = Economy.RetrieveEcoStats(message); diff --git a/Commands/Economy/CmdPay.cs b/Commands/Economy/CmdPay.cs index f7a4c4b0f..af5cdba90 100644 --- a/Commands/Economy/CmdPay.cs +++ b/Commands/Economy/CmdPay.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands if (message.IndexOf(' ') == -1) { Help(p); return; } if (message.Split(' ').Length != 2) { Help(p); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); Economy.EcoStats payer; Economy.EcoStats receiver; @@ -44,8 +44,8 @@ namespace MCGalaxy.Commands if (who == null) { //player is offline - Player.OfflinePlayer off = Player.FindOffline(message.Split()[0]); - if (off.name == "") { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } + OfflinePlayer off = PlayerInfo.FindOffline(message.Split()[0]); + if (off == null) { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } payer = Economy.RetrieveEcoStats(p.name); receiver = Economy.RetrieveEcoStats(message.Split()[0]); diff --git a/Commands/Fun/CmdAka.cs b/Commands/Fun/CmdAka.cs index 54b089002..6dae65c68 100644 --- a/Commands/Fun/CmdAka.cs +++ b/Commands/Fun/CmdAka.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands ushort x = p.pos[0], y = p.pos[1], z = p.pos[2]; p.Loading = true; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) if (p.level == pl.level && p != pl) p.SendDespawn(pl.id); foreach (PlayerBot b in PlayerBot.playerbots) if (p.level == b.level) p.SendDespawn(b.id); @@ -50,7 +50,7 @@ namespace MCGalaxy.Commands p.SendPos(0xFF, x, y, z, p.level.rotx, p.level.roty); } - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level != p.level || p == pl || pl.hidden || pl.referee) continue; diff --git a/Commands/Fun/CmdAlive.cs b/Commands/Fun/CmdAlive.cs index 105823235..855150381 100644 --- a/Commands/Fun/CmdAlive.cs +++ b/Commands/Fun/CmdAlive.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { Player who = null; - if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } + if (message == "") { who = p; message = p.name; } else { who = PlayerInfo.Find(message); } if (ZombieGame.alive.Count == 0) { Player.SendMessage(p, "No one is alive."); diff --git a/Commands/Fun/CmdCountdown.cs b/Commands/Fun/CmdCountdown.cs index be6cbb68c..ba42813e0 100644 --- a/Commands/Fun/CmdCountdown.cs +++ b/Commands/Fun/CmdCountdown.cs @@ -241,7 +241,7 @@ namespace MCGalaxy.Commands } else if (!String.IsNullOrEmpty(par2)) { - Player who = Player.Find(par2); + Player who = PlayerInfo.Find(par2); if (who == null) { Player.SendMessage(p, "That wasn't an online player."); diff --git a/Commands/Fun/CmdDisinfect.cs b/Commands/Fun/CmdDisinfect.cs index bba7d5b8a..59e6466c1 100644 --- a/Commands/Fun/CmdDisinfect.cs +++ b/Commands/Fun/CmdDisinfect.cs @@ -27,7 +27,7 @@ namespace MCGalaxy.Commands { public CmdDisInfect() { } public override void Use(Player p, string message) { - Player who = message == "" ? p : Player.Find(message); + Player who = message == "" ? p : PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "There is no player \"" + message + "\"!"); return; } diff --git a/Commands/Fun/CmdInfect.cs b/Commands/Fun/CmdInfect.cs index eef8bdbed..c3e8781f4 100644 --- a/Commands/Fun/CmdInfect.cs +++ b/Commands/Fun/CmdInfect.cs @@ -27,7 +27,7 @@ namespace MCGalaxy.Commands { public CmdInfect() { } public override void Use(Player p, string message) { - Player who = message == "" ? p : Player.Find(message); + Player who = message == "" ? p : PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "There is no player \"" + message + "\"!"); return; } diff --git a/Commands/Fun/CmdInfected.cs b/Commands/Fun/CmdInfected.cs index 4e84d0f08..1b8b40f76 100644 --- a/Commands/Fun/CmdInfected.cs +++ b/Commands/Fun/CmdInfected.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { Player who = null; - if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } + if (message == "") { who = p; message = p.name; } else { who = PlayerInfo.Find(message); } if (ZombieGame.infectd.Count == 0) { Player.SendMessage(p, "No one is infected"); diff --git a/Commands/Fun/CmdQueue.cs b/Commands/Fun/CmdQueue.cs index 3a8248b56..4b153d79f 100644 --- a/Commands/Fun/CmdQueue.cs +++ b/Commands/Fun/CmdQueue.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands string value = args[1]; if (args[0] == "zombie") { - Player who = Player.Find(value); + Player who = PlayerInfo.Find(value); if (who == null) { p.SendMessage(value + " is not online."); } else { diff --git a/Commands/Fun/CmdSlap.cs b/Commands/Fun/CmdSlap.cs index a406e5286..66c6a0c8c 100644 --- a/Commands/Fun/CmdSlap.cs +++ b/Commands/Fun/CmdSlap.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { @@ -43,7 +43,7 @@ namespace MCGalaxy.Commands } else { - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == which && pl.group.Permission < p.group.Permission) { diff --git a/Commands/Fun/CmdTntWars.cs b/Commands/Fun/CmdTntWars.cs index f59f14a1b..6d5b3f209 100644 --- a/Commands/Fun/CmdTntWars.cs +++ b/Commands/Fun/CmdTntWars.cs @@ -246,7 +246,7 @@ namespace MCGalaxy.Commands case "everyone": if ((int)p.group.Permission >= CommandOtherPerms.GetPerm(this, 1)) { - foreach (Player who in Player.players) + foreach (Player who in PlayerInfo.players) { Player.SendMessage(who, "TNT Wars Rules: (sent to all players by " + p.color + p.name + Server.DefaultColor + " )"); Player.SendMessage(who, "The aim of the game is to blow up people using TNT!"); @@ -312,7 +312,7 @@ namespace MCGalaxy.Commands default: if (text[1] != null && (int)p.group.Permission >= CommandOtherPerms.GetPerm(this, 1)) { - Player who = Player.Find(text[1]); + Player who = PlayerInfo.Find(text[1]); if (who != null) { Player.SendMessage(who, "TNT Wars Rules: (sent to you by " + p.color + p.name + Server.DefaultColor + " )"); diff --git a/Commands/Information/CmdClones.cs b/Commands/Information/CmdClones.cs index 3b7db9222..2bebb72a0 100644 --- a/Commands/Information/CmdClones.cs +++ b/Commands/Information/CmdClones.cs @@ -37,7 +37,7 @@ namespace MCGalaxy.Commands string originalName = message.ToLower(); - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player. Searching Player DB."); diff --git a/Commands/Information/CmdFaq.cs b/Commands/Information/CmdFaq.cs index d49a14117..0290f8610 100644 --- a/Commands/Information/CmdFaq.cs +++ b/Commands/Information/CmdFaq.cs @@ -40,7 +40,7 @@ namespace MCGalaxy.Commands { if ((int)p.group.Permission < CommandOtherPerms.GetPerm(this)) { Player.SendMessage(p, "You can't send the FAQ to another player!"); return; } - who = Player.Find(message); + who = PlayerInfo.Find(message); } else { diff --git a/Commands/Information/CmdLastCmd.cs b/Commands/Information/CmdLastCmd.cs index 8bdc5538f..abb679359 100644 --- a/Commands/Information/CmdLastCmd.cs +++ b/Commands/Information/CmdLastCmd.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands { if (message == "") { - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.lastCMD.Contains("setpass") || pl.lastCMD.Contains("pass")) { @@ -48,7 +48,7 @@ namespace MCGalaxy.Commands } else { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || who.group.Permission > p.group.Permission && who.hidden) { Player.SendMessage(p, "Could not find player entered"); return; } if (who.lastCMD.Contains("setpass") || who.lastCMD.Contains("pass")) { diff --git a/Commands/Information/CmdNews.cs b/Commands/Information/CmdNews.cs index 476edeba9..a269e8119 100644 --- a/Commands/Information/CmdNews.cs +++ b/Commands/Information/CmdNews.cs @@ -58,7 +58,7 @@ namespace MCGalaxy.Commands return; } - Player player = Player.Find(split[0]); + Player player = PlayerInfo.Find(split[0]); if (player == null) { Player.SendMessage(p, "Could not find player \"" + split[0] + "\"!"); return; } foreach (string t in lines) { diff --git a/Commands/Information/CmdOpRules.cs b/Commands/Information/CmdOpRules.cs index 884affc59..0a49e8eb2 100644 --- a/Commands/Information/CmdOpRules.cs +++ b/Commands/Information/CmdOpRules.cs @@ -38,7 +38,7 @@ namespace MCGalaxy.Commands Player who = null; if (message != "") { - who = Player.Find(message); + who = PlayerInfo.Find(message); if (p.group.Permission < who.group.Permission) { Player.SendMessage(p, "You cant send /oprules to another player!"); return; } } else diff --git a/Commands/Information/CmdOpStats.cs b/Commands/Information/CmdOpStats.cs index b26261e31..fd71aa033 100644 --- a/Commands/Information/CmdOpStats.cs +++ b/Commands/Information/CmdOpStats.cs @@ -43,7 +43,7 @@ namespace MCGalaxy.Commands { if (message != "") spanStart = message.ToLower(); } else { - target = Player.Find(args[0]); + target = PlayerInfo.Find(args[0]); if (args.Length > 1 && ValidTimespan(args[1].ToLower())) spanStart = args[1].ToLower(); } diff --git a/Commands/Information/CmdPClients.cs b/Commands/Information/CmdPClients.cs index 9fc14aa51..ce33538f0 100644 --- a/Commands/Information/CmdPClients.cs +++ b/Commands/Information/CmdPClients.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands { public override void Use(Player p, string message) { Dictionary> clients = new Dictionary>(); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!pl.hidden || p == null || p.group.Permission > LevelPermission.Operator) { string appName = pl.appName; if (String.IsNullOrEmpty(appName)) diff --git a/Commands/Information/CmdPCount.cs b/Commands/Information/CmdPCount.cs index 5ee62d050..9476f9f4b 100644 --- a/Commands/Information/CmdPCount.cs +++ b/Commands/Information/CmdPCount.cs @@ -40,7 +40,7 @@ namespace MCGalaxy.Commands int playerCount = 0; int hiddenCount = 0; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (!pl.hidden || p == null || p.group.Permission > LevelPermission.AdvBuilder) { diff --git a/Commands/Information/CmdPlayers.cs b/Commands/Information/CmdPlayers.cs index 40693e8c2..a32dff66f 100644 --- a/Commands/Information/CmdPlayers.cs +++ b/Commands/Information/CmdPlayers.cs @@ -43,7 +43,7 @@ namespace MCGalaxy.Commands string title = ":" + grp.color + GetPlural(grp.trueName) + ":"; Section rankSec = MakeSection(grp, title); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.group != grp) continue; if (!pl.hidden || p == null || p.group.Permission > LevelPermission.Operator) { string name = Colors.StripColours(pl.DisplayName); @@ -74,7 +74,7 @@ namespace MCGalaxy.Commands Section gcModsSec = MakeSection("#%6MCGalaxy GCMods:" + Server.DefaultColor); int totalPlayers = 0; - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!pl.hidden || p == null || p.group.Permission > LevelPermission.Operator) { totalPlayers++; string name = Colors.StripColours(pl.DisplayName); diff --git a/Commands/Information/CmdRules.cs b/Commands/Information/CmdRules.cs index f0e593aa9..10fb15989 100644 --- a/Commands/Information/CmdRules.cs +++ b/Commands/Information/CmdRules.cs @@ -44,7 +44,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "You can't send /rules to another player!"); return; } - who = Player.Find(message); + who = PlayerInfo.Find(message); } else { who = p; } diff --git a/Commands/Information/CmdSearch.cs b/Commands/Information/CmdSearch.cs index e2bf22985..75ecfd3ca 100644 --- a/Commands/Information/CmdSearch.cs +++ b/Commands/Information/CmdSearch.cs @@ -85,7 +85,7 @@ namespace MCGalaxy.Commands if (type.ToLower().Contains("player")) { string players = ""; - foreach (Player who in Player.players) + foreach (Player who in PlayerInfo.players) { if (who.name.ToLower().Contains(keyword.ToLower())) { diff --git a/Commands/Information/CmdWhoNick.cs b/Commands/Information/CmdWhoNick.cs index d9f4aab25..096d46eb9 100644 --- a/Commands/Information/CmdWhoNick.cs +++ b/Commands/Information/CmdWhoNick.cs @@ -31,12 +31,12 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - if (Player.FindNick(message) == null) + if (PlayerInfo.FindNick(message) == null) { Player.SendMessage(p, "The player is not online."); return; } - Player.SendMessage(p, "This player's real username is " + Player.FindNick(message).name); + Player.SendMessage(p, "This player's real username is " + PlayerInfo.FindNick(message).name); } public override void Help(Player p) diff --git a/Commands/Information/CmdWhois.cs b/Commands/Information/CmdWhois.cs index 17af7b25e..e40fb7700 100644 --- a/Commands/Information/CmdWhois.cs +++ b/Commands/Information/CmdWhois.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { Player who = null; - if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } + if (message == "") { who = p; message = p.name; } else { who = PlayerInfo.Find(message); } if (who != null && !who.hidden) { Player.SendMessage(p, who.color + who.name + Server.DefaultColor + " (" + who.DisplayName + ") " + Server.DefaultColor + " is on &b" + who.level.name); diff --git a/Commands/Information/CmdWhowas.cs b/Commands/Information/CmdWhowas.cs index d470930a2..1a7fb6402 100644 --- a/Commands/Information/CmdWhowas.cs +++ b/Commands/Information/CmdWhowas.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player pl = Player.Find(message); + Player pl = PlayerInfo.Find(message); if (pl != null && !pl.hidden) { Player.SendMessage(p, pl.color + pl.name + Server.DefaultColor + " is online, using /whois instead."); diff --git a/Commands/Moderation/CmdAllowGuns.cs b/Commands/Moderation/CmdAllowGuns.cs index 5e4402920..7283ca5b7 100644 --- a/Commands/Moderation/CmdAllowGuns.cs +++ b/Commands/Moderation/CmdAllowGuns.cs @@ -45,7 +45,7 @@ namespace MCGalaxy.Commands { if (lvl.guns) { Player.GlobalMessage("&9Gun usage has been disabled on &c" + lvl.name + "&9!"); - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) if (pl.level.name.ToLower() == lvl.name.ToLower()) pl.aiming = false; } else { diff --git a/Commands/Moderation/CmdBan.cs b/Commands/Moderation/CmdBan.cs index c2176c492..4d5567c10 100644 --- a/Commands/Moderation/CmdBan.cs +++ b/Commands/Moderation/CmdBan.cs @@ -48,7 +48,7 @@ namespace MCGalaxy.Commands { string banReason = reason == "-" ? "" : " (" + reason + ")"; if (reason == "-") reason = "&c-"; reason = reason.Replace(" ", "%20"); - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); string target = who == null ? args[0] : who.name; if (!Player.ValidName(target)) { diff --git a/Commands/Moderation/CmdBanip.cs b/Commands/Moderation/CmdBanip.cs index 25849da28..e83bbb75f 100644 --- a/Commands/Moderation/CmdBanip.cs +++ b/Commands/Moderation/CmdBanip.cs @@ -36,7 +36,7 @@ namespace MCGalaxy.Commands { string name = ""; if (message[0] == '@') { message = message.Remove(0, 1).Trim(); - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { DataTable ip; @@ -66,7 +66,7 @@ namespace MCGalaxy.Commands { message = who.ip; } } else { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who != null) { name = who.name.ToLower(); message = who.ip; @@ -81,7 +81,7 @@ namespace MCGalaxy.Commands { // Check if IP belongs to an op+ // First get names of active ops+ with that ip - List opNamesWithThatIP = (from pl in Player.players where (pl.ip == message && pl.@group.Permission >= LevelPermission.Operator) select pl.name).ToList(); + List opNamesWithThatIP = (from pl in PlayerInfo.players where (pl.ip == message && pl.@group.Permission >= LevelPermission.Operator) select pl.name).ToList(); // Next, add names from the database Database.AddParams("@IP", message); DataTable dbnames = Database.fillData("SELECT Name FROM Players WHERE IP = @IP"); @@ -126,7 +126,7 @@ namespace MCGalaxy.Commands { Server.bannedIP.Save("banned-ip.txt", false); /* - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (message == pl.ip) { pl.Kick("Kicked by ipban"); } }*/ } diff --git a/Commands/Moderation/CmdBlockSet.cs b/Commands/Moderation/CmdBlockSet.cs index f9d05ea29..24d86cb69 100644 --- a/Commands/Moderation/CmdBlockSet.cs +++ b/Commands/Moderation/CmdBlockSet.cs @@ -44,7 +44,7 @@ namespace MCGalaxy.Commands Block.BlockList[Block.BlockList.FindIndex(bL => bL.type == foundBlock)] = newBlock; Block.SaveBlocks(Block.BlockList); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!pl.HasCpeExt(CpeExt.BlockPermissions)) continue; int count = pl.hasCustomBlocks ? Block.CpeCount : Block.OriginalCount; diff --git a/Commands/Moderation/CmdBlockSpeed.cs b/Commands/Moderation/CmdBlockSpeed.cs index f41b0e007..4b7b3c75a 100644 --- a/Commands/Moderation/CmdBlockSpeed.cs +++ b/Commands/Moderation/CmdBlockSpeed.cs @@ -115,7 +115,7 @@ namespace MCGalaxy.Commands private static void SendEstimation(Player p) { Player.SendMessage(p, String.Format("{0} blocks every {1} milliseconds = {2} blocks per second.", BlockQueue.blockupdates, BlockQueue.time, BlockQueue.blockupdates * (1000 / BlockQueue.time))); - Player.SendMessage(p, String.Format("Using ~{0}KB/s times {1} player(s) = ~{2}KB/s", (BlockQueue.blockupdates * (1000 / BlockQueue.time) * 8) / 1000, Player.players.Count, Player.players.Count * ((BlockQueue.blockupdates * (1000 / BlockQueue.time) * 8) / 1000))); + Player.SendMessage(p, String.Format("Using ~{0}KB/s times {1} player(s) = ~{2}KB/s", (BlockQueue.blockupdates * (1000 / BlockQueue.time) * 8) / 1000, PlayerInfo.players.Count, PlayerInfo.players.Count * ((BlockQueue.blockupdates * (1000 / BlockQueue.time) * 8) / 1000))); } public override void Help(Player p) { diff --git a/Commands/Moderation/CmdDelTempRank.cs b/Commands/Moderation/CmdDelTempRank.cs index 506cd5790..2d801596b 100644 --- a/Commands/Moderation/CmdDelTempRank.cs +++ b/Commands/Moderation/CmdDelTempRank.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands return; } string alltempranks = ""; - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); foreach (string line in File.ReadAllLines("text/tempranks.txt")) { if (line.Contains(message)) diff --git a/Commands/Moderation/CmdDemote.cs b/Commands/Moderation/CmdDemote.cs index 743119ec3..156050801 100644 --- a/Commands/Moderation/CmdDemote.cs +++ b/Commands/Moderation/CmdDemote.cs @@ -17,7 +17,7 @@ namespace MCGalaxy.Commands { string[] args = message.Split(trimChars, 2); Player target = null; - if (args.Length == 0 || (target = Player.Find(args[0])) == null) { + if (args.Length == 0 || (target = PlayerInfo.Find(args[0])) == null) { Help(p); return; } diff --git a/Commands/Moderation/CmdEndRound.cs b/Commands/Moderation/CmdEndRound.cs index 7b7bab830..02643505c 100644 --- a/Commands/Moderation/CmdEndRound.cs +++ b/Commands/Moderation/CmdEndRound.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { Player who = null; - if (message == "") { who = p; message = p.name; } else { who = Player.Find(message); } + if (message == "") { who = p; message = p.name; } else { who = PlayerInfo.Find(message); } if (Server.zombie.GameInProgess()) { Server.zombie.HandOutRewards(); diff --git a/Commands/Moderation/CmdExplode.cs b/Commands/Moderation/CmdExplode.cs index 7350f4517..f9c770963 100644 --- a/Commands/Moderation/CmdExplode.cs +++ b/Commands/Moderation/CmdExplode.cs @@ -37,7 +37,7 @@ namespace MCGalaxy.Commands ushort x, y, z; if (args.Length == 1) { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || who.hidden) { Player.SendMessage(p, "The specified player does not exist!"); return; } diff --git a/Commands/Moderation/CmdFollow.cs b/Commands/Moderation/CmdFollow.cs index 0c5232578..a4a5bdfc4 100644 --- a/Commands/Moderation/CmdFollow.cs +++ b/Commands/Moderation/CmdFollow.cs @@ -64,14 +64,14 @@ namespace MCGalaxy.Commands } } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (message == "" && p.following == "") { Help(p); return; } else if (message == "" && p.following != "" || message == p.following) { - who = Player.Find(p.following); + who = PlayerInfo.Find(p.following); p.following = ""; if (p.hidden) { @@ -105,10 +105,10 @@ namespace MCGalaxy.Commands if (p.level != who.level) Command.all.Find("tp").Use(p, who.name); if (p.following != "") { - who = Player.Find(p.following); + who = PlayerInfo.Find(p.following); p.SendSpawn(who.id, who.color + who.name, who.pos[0], who.pos[1], who.pos[2], who.rot[0], who.rot[1]); } - who = Player.Find(message); + who = PlayerInfo.Find(message); p.following = who.name; Player.SendMessage(p, "Following " + who.color + who.DisplayName + Server.DefaultColor + ". Use \"/follow\" to stop."); p.SendDespawn(who.id); diff --git a/Commands/Moderation/CmdFreeze.cs b/Commands/Moderation/CmdFreeze.cs index 0a471e541..3e0fad26f 100644 --- a/Commands/Moderation/CmdFreeze.cs +++ b/Commands/Moderation/CmdFreeze.cs @@ -29,7 +29,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } else if (who == p) { Player.SendMessage(p, "Cannot freeze yourself."); return; } else if (p != null) { if (who.group.Permission >= p.group.Permission) { Player.SendMessage(p, "Cannot freeze someone of equal or greater rank."); return; } } diff --git a/Commands/Moderation/CmdHighlight.cs b/Commands/Moderation/CmdHighlight.cs index 8c6ed6652..f36d300e1 100644 --- a/Commands/Moderation/CmdHighlight.cs +++ b/Commands/Moderation/CmdHighlight.cs @@ -66,7 +66,7 @@ namespace MCGalaxy.Commands if (seconds == 0) seconds = 5400; - who = Player.Find(message.Split(' ')[0]); + who = PlayerInfo.Find(message.Split(' ')[0]); if (who != null) { message = who.name + " " + seconds; diff --git a/Commands/Moderation/CmdJail.cs b/Commands/Moderation/CmdJail.cs index fc44e1979..d075f8fdc 100644 --- a/Commands/Moderation/CmdJail.cs +++ b/Commands/Moderation/CmdJail.cs @@ -38,7 +38,7 @@ namespace MCGalaxy } else { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who != null) { if (!who.jailed) diff --git a/Commands/Moderation/CmdJoker.cs b/Commands/Moderation/CmdJoker.cs index 43c564ae5..35abee3d8 100644 --- a/Commands/Moderation/CmdJoker.cs +++ b/Commands/Moderation/CmdJoker.cs @@ -38,7 +38,7 @@ namespace MCGalaxy.Commands Server.s.Log("Stealth joker attempted"); } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player."); diff --git a/Commands/Moderation/CmdKick.cs b/Commands/Moderation/CmdKick.cs index f97f8e212..7f64d8907 100644 --- a/Commands/Moderation/CmdKick.cs +++ b/Commands/Moderation/CmdKick.cs @@ -29,7 +29,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); if (who == null) { Player.SendMessage(p, "Could not find player specified."); return; } if (message.Split(' ').Length > 1) message = message.Substring(message.IndexOf(' ') + 1); diff --git a/Commands/Moderation/CmdLocation.cs b/Commands/Moderation/CmdLocation.cs index ac020650a..28b46f6df 100644 --- a/Commands/Moderation/CmdLocation.cs +++ b/Commands/Moderation/CmdLocation.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands Player who = null; string searchip = ""; string name; - who = Player.Find(message); + who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, Colors.red + "Could not find player " + message + " ...searching in database"); diff --git a/Commands/Moderation/CmdMoveAll.cs b/Commands/Moderation/CmdMoveAll.cs index 92d64ffe8..f1b3ce0d8 100644 --- a/Commands/Moderation/CmdMoveAll.cs +++ b/Commands/Moderation/CmdMoveAll.cs @@ -29,9 +29,9 @@ namespace MCGalaxy.Commands Level level = Level.Find(message.Split(' ')[0]); if (level == null) { Player.SendMessage(p, "There is no level named '" + message.Split(' ')[0] + "'."); return; } if (p == null) - foreach (Player pl in Player.players) { Command.all.Find("move").Use(null, pl.name + " " + level.name); } + foreach (Player pl in PlayerInfo.players) { Command.all.Find("move").Use(null, pl.name + " " + level.name); } else - foreach (Player pl in Player.players) { if (pl.group.Permission < p.group.Permission) Command.all.Find("move").Use(p, pl.name + " " + level.name); else Player.SendMessage(p, "You cannot move " + pl.color + pl.name + Server.DefaultColor + " because they are of equal or higher rank"); } + foreach (Player pl in PlayerInfo.players) { if (pl.group.Permission < p.group.Permission) Command.all.Find("move").Use(p, pl.name + " " + level.name); else Player.SendMessage(p, "You cannot move " + pl.color + pl.name + Server.DefaultColor + " because they are of equal or higher rank"); } } public override void Help(Player p) { Player.SendMessage(p, "/moveall - Moves all players to the level specified."); } } diff --git a/Commands/Moderation/CmdMute.cs b/Commands/Moderation/CmdMute.cs index b7856e9a3..7c3390fd3 100644 --- a/Commands/Moderation/CmdMute.cs +++ b/Commands/Moderation/CmdMute.cs @@ -35,7 +35,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "" || message.Split(' ').Length > 2) { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { diff --git a/Commands/Moderation/CmdOhide.cs b/Commands/Moderation/CmdOhide.cs index dd384114c..cdff4c10f 100644 --- a/Commands/Moderation/CmdOhide.cs +++ b/Commands/Moderation/CmdOhide.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } message = message.Split(' ')[0]; - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player."); diff --git a/Commands/Moderation/CmdP2P.cs b/Commands/Moderation/CmdP2P.cs index d221c2b24..a86f1f924 100644 --- a/Commands/Moderation/CmdP2P.cs +++ b/Commands/Moderation/CmdP2P.cs @@ -42,8 +42,8 @@ namespace MCGalaxy.Commands int pos = message.IndexOf(' '); string t = message.Substring(0, pos).ToLower(); string s = message.Substring(pos + 1).ToLower(); - Player who = Player.Find(t); - Player who2 = Player.Find(s); + Player who = PlayerInfo.Find(t); + Player who2 = PlayerInfo.Find(s); if (who == null) { if (who2 == null) diff --git a/Commands/Moderation/CmdPatrol.cs b/Commands/Moderation/CmdPatrol.cs index 18abc4cc5..16fd6b1b0 100644 --- a/Commands/Moderation/CmdPatrol.cs +++ b/Commands/Moderation/CmdPatrol.cs @@ -47,7 +47,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "Are you stupid? =S You can't use this in the console!"); return; } - List getpatrol = (from pl in Player.players where (int) pl.@group.Permission <= CommandOtherPerms.GetPerm(this) select pl.name).ToList(); + List getpatrol = (from pl in PlayerInfo.players where (int) pl.@group.Permission <= CommandOtherPerms.GetPerm(this) select pl.name).ToList(); if (getpatrol.Count <= 0) { Player.SendMessage(p, "There must be at least one guest online to use this command!"); @@ -56,7 +56,7 @@ namespace MCGalaxy.Commands Random random = new Random(); int index = random.Next(getpatrol.Count); string value = getpatrol[index]; - Player who = Player.Find(value); + Player who = PlayerInfo.Find(value); Command.all.Find("tp").Use(p, who.name); Player.SendMessage(p, "You are now visiting " + who.color + who.name + "!"); } diff --git a/Commands/Moderation/CmdPlayerEditDB.cs b/Commands/Moderation/CmdPlayerEditDB.cs index b4453dbd4..802d27f02 100644 --- a/Commands/Moderation/CmdPlayerEditDB.cs +++ b/Commands/Moderation/CmdPlayerEditDB.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands { public override void Use(Player p, string message) { if (message == "") { Help(p); return; } string[] args = message.Split(' '); - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); if (who == null) { Database.AddParams("@Name", args[0]); string syntax = Server.useMySQL ? "SELECT * FROM players WHERE Name=@Name COLLATE utf8_general_ci" : diff --git a/Commands/Moderation/CmdPossess.cs b/Commands/Moderation/CmdPossess.cs index 9d5fa1fc0..7edeb9d66 100644 --- a/Commands/Moderation/CmdPossess.cs +++ b/Commands/Moderation/CmdPossess.cs @@ -45,7 +45,7 @@ namespace MCGalaxy.Commands } else { - Player who = Player.Find(p.possess); + Player who = PlayerInfo.Find(p.possess); if (who == null) { p.possess = ""; @@ -67,7 +67,7 @@ namespace MCGalaxy.Commands } else if (message == p.possess) { - Player who = Player.Find(p.possess); + Player who = PlayerInfo.Find(p.possess); if (who == null) { p.possess = ""; @@ -93,7 +93,7 @@ namespace MCGalaxy.Commands } else { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player."); @@ -116,7 +116,7 @@ namespace MCGalaxy.Commands } if (p.possess != "") { - Player oldwho = Player.Find(p.possess); + Player oldwho = PlayerInfo.Find(p.possess); if (oldwho != null) { oldwho.following = ""; diff --git a/Commands/Moderation/CmdPromote.cs b/Commands/Moderation/CmdPromote.cs index a42f1077e..e61d58909 100644 --- a/Commands/Moderation/CmdPromote.cs +++ b/Commands/Moderation/CmdPromote.cs @@ -17,7 +17,7 @@ namespace MCGalaxy.Commands { string[] args = message.Split( trimChars, 2 ); Player target = null; - if (args.Length == 0 || (target = Player.Find(args[0])) == null) { + if (args.Length == 0 || (target = PlayerInfo.Find(args[0])) == null) { Help(p); return; } diff --git a/Commands/Moderation/CmdRankInfo.cs b/Commands/Moderation/CmdRankInfo.cs index b6f796c91..ad8b957b8 100644 --- a/Commands/Moderation/CmdRankInfo.cs +++ b/Commands/Moderation/CmdRankInfo.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands { public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); string target = who == null ? message : who.name; Player.SendMessage(p, "&1Rank Information of " + target); diff --git a/Commands/Moderation/CmdReveal.cs b/Commands/Moderation/CmdReveal.cs index 76aad6db1..0b927e2d6 100644 --- a/Commands/Moderation/CmdReveal.cs +++ b/Commands/Moderation/CmdReveal.cs @@ -48,12 +48,12 @@ namespace MCGalaxy.Commands { Player.SendMessage(p, "Reserved for " + Group.findPermInt(CommandOtherPerms.GetPerm(this)).name + "+"); return; } - foreach (Player who in Player.players.ToArray()) { + foreach (Player who in PlayerInfo.players.ToArray()) { if (who.level == lvl) ReloadMap(p, who, true); } } else { - Player who = Player.Find(parts[0]); + Player who = PlayerInfo.Find(parts[0]); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } else if (who.group.Permission > p.group.Permission && p != who) { @@ -67,7 +67,7 @@ namespace MCGalaxy.Commands { internal static void ReloadMap(Player p, Player who, bool showMessage) { who.Loading = true; - foreach (Player pl in Player.players.ToArray()) if (who.level == pl.level && who != pl) who.SendDespawn(pl.id); + foreach (Player pl in PlayerInfo.players.ToArray()) if (who.level == pl.level && who != pl) who.SendDespawn(pl.id); foreach (PlayerBot b in PlayerBot.playerbots.ToArray()) if (who.level == b.level) who.SendDespawn(b.id); ushort x = who.pos[0], y = who.pos[1], z = who.pos[2]; @@ -79,7 +79,7 @@ namespace MCGalaxy.Commands { else who.SendPos(0xFF, x, y, z, who.level.rotx, who.level.roty); - foreach (Player pl in Player.players.ToArray()) + foreach (Player pl in PlayerInfo.players.ToArray()) if (pl.level == who.level && who != pl && !pl.hidden) who.SendSpawn(pl.id, pl.color + pl.name, pl.pos[0], pl.pos[1], pl.pos[2], pl.rot[0], pl.rot[1]); diff --git a/Commands/Moderation/CmdSeen.cs b/Commands/Moderation/CmdSeen.cs index a8b0f98c0..538fe6b28 100644 --- a/Commands/Moderation/CmdSeen.cs +++ b/Commands/Moderation/CmdSeen.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands { if(message == "") { Help(p); return; } - Player pl = Player.Find(message); + Player pl = PlayerInfo.Find(message); if (pl != null && !pl.hidden) { Player.SendMessage(p, pl.color + pl.name + Server.DefaultColor + " is currently online."); diff --git a/Commands/Moderation/CmdSetRank.cs b/Commands/Moderation/CmdSetRank.cs index 4f37a0e1a..e7fed7d3b 100644 --- a/Commands/Moderation/CmdSetRank.cs +++ b/Commands/Moderation/CmdSetRank.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { string[] args = message.Split(trimChars, 3); if (args.Length < 2) { Help(p); return; } - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); Group newRank = Group.Find(args[1]); string reason = args.Length > 2 ? args[2] : "Congratulations!"; diff --git a/Commands/Moderation/CmdTempBan.cs b/Commands/Moderation/CmdTempBan.cs index 4f52d4730..02ce0897e 100644 --- a/Commands/Moderation/CmdTempBan.cs +++ b/Commands/Moderation/CmdTempBan.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands if (message == "") { Help(p); return; } if (message.IndexOf(' ') == -1) message = message + " 60"; - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); if (who == null) { Player.SendMessage(p, "Could not find player"); return; } if (p != null && who.group.Permission >= p.group.Permission) { Player.SendMessage(p, "Cannot ban someone of the same rank"); return; } int minutes; diff --git a/Commands/Moderation/CmdTempRank.cs b/Commands/Moderation/CmdTempRank.cs index af65210a1..590b3db53 100644 --- a/Commands/Moderation/CmdTempRank.cs +++ b/Commands/Moderation/CmdTempRank.cs @@ -39,7 +39,7 @@ namespace MCGalaxy.Commands Help(p); } - Player who = Player.Find(player); + Player who = PlayerInfo.Find(player); if (player == "") { Player.SendMessage(p, "&cYou have to enter a player!"); return; } @@ -91,7 +91,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "&cYou cannot assign yourself a temporary rank!"); return; } - Player who3 = Player.Find(player); + Player who3 = PlayerInfo.Find(player); if (who3.group.Permission >= p.group.Permission) { Player.SendMessage(p, "Cannot change the temporary rank of someone equal or higher to yourself."); @@ -142,7 +142,7 @@ namespace MCGalaxy.Commands Group newgroup = Group.Find(rank); Command.all.Find("setrank").Use(null, who.name + " " + newgroup.name); Player.SendMessage(p, "Temporary rank (" + rank + ") is assigned succesfully to " + player + " for " + period + " hours"); - Player who2 = Player.Find(player); + Player who2 = PlayerInfo.Find(player); Player.SendMessage(who2, "Your Temporary rank (" + rank + ") is assigned succesfully for " + period + " hours"); } diff --git a/Commands/Moderation/CmdTrust.cs b/Commands/Moderation/CmdTrust.cs index c12552f9c..1523c8bca 100644 --- a/Commands/Moderation/CmdTrust.cs +++ b/Commands/Moderation/CmdTrust.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands { if (message == "" || message.IndexOf(' ') != -1) { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player specified"); diff --git a/Commands/Moderation/CmdUBan.cs b/Commands/Moderation/CmdUBan.cs index 861f795f9..8f94c37a0 100644 --- a/Commands/Moderation/CmdUBan.cs +++ b/Commands/Moderation/CmdUBan.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands if (message == "") { Help(p); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); string msg = message.Split(' ')[0]; if (who != null) { diff --git a/Commands/Moderation/CmdUnban.cs b/Commands/Moderation/CmdUnban.cs index 7f755b685..6fd4301d3 100644 --- a/Commands/Moderation/CmdUnban.cs +++ b/Commands/Moderation/CmdUnban.cs @@ -40,7 +40,7 @@ namespace MCGalaxy.Commands message = message.Remove(0, 1).Trim(); } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { diff --git a/Commands/Moderation/CmdUnbanip.cs b/Commands/Moderation/CmdUnbanip.cs index ba5463444..fb3d22357 100644 --- a/Commands/Moderation/CmdUnbanip.cs +++ b/Commands/Moderation/CmdUnbanip.cs @@ -35,7 +35,7 @@ namespace MCGalaxy.Commands if (message[0] == '@') { message = message.Remove(0, 1).Trim(); - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { DataTable ip; diff --git a/Commands/Moderation/CmdVIP.cs b/Commands/Moderation/CmdVIP.cs index f6fb88552..042c31aae 100644 --- a/Commands/Moderation/CmdVIP.cs +++ b/Commands/Moderation/CmdVIP.cs @@ -35,7 +35,7 @@ namespace MCGalaxy.Commands if (split[0] == "add") { if (split.Length < 2) { Help(p); return; } - Player pl = Player.Find(split[1]); + Player pl = PlayerInfo.Find(split[1]); if (pl != null) split[1] = pl.name; if (VIP.Find(split[1])) Player.SendMessage(p, (pl == null ? "" : pl.color) + split[1] + " is already a VIP!"); else @@ -48,7 +48,7 @@ namespace MCGalaxy.Commands else if (split[0] == "remove") { if (split.Length < 2) { Help(p); return; } - Player pl = Player.Find(split[1]); + Player pl = PlayerInfo.Find(split[1]); if (pl != null) split[1] = pl.name; if (!VIP.Find(split[1])) Player.SendMessage(p, (pl == null ? "" : pl.color) + split[1] + " is not a VIP!"); else diff --git a/Commands/Moderation/CmdVoice.cs b/Commands/Moderation/CmdVoice.cs index 4be3406e7..f22683810 100644 --- a/Commands/Moderation/CmdVoice.cs +++ b/Commands/Moderation/CmdVoice.cs @@ -29,7 +29,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who != null) { if (who.voice) diff --git a/Commands/Moderation/CmdVoteKick.cs b/Commands/Moderation/CmdVoteKick.cs index de16ba3f1..62ec90c50 100644 --- a/Commands/Moderation/CmdVoteKick.cs +++ b/Commands/Moderation/CmdVoteKick.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands if (Server.voteKickInProgress) { Player.SendMessage(p, "Please wait for the current vote to finish!"); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null) { Player.SendMessage(p, "Could not find player specified!"); @@ -52,7 +52,7 @@ namespace MCGalaxy.Commands // 1/3rd of the players must vote or nothing happens // Keep it at 0 to disable min number of votes - Server.voteKickVotesNeeded = 3; //(int)(Player.players.Count / 3) + 1; + Server.voteKickVotesNeeded = 3; //(int)(PlayerInfo.players.Count / 3) + 1; Server.voteKickInProgress = true; System.Timers.Timer voteTimer = new System.Timers.Timer(30000); @@ -66,7 +66,7 @@ namespace MCGalaxy.Commands int votesYes = 0; int votesNo = 0; - Player.players.ForEach(delegate(Player pl) + PlayerInfo.players.ForEach(delegate(Player pl) { // Tally the votes if (pl.voteKickChoice == VoteKickChoice.Yes) votesYes++; diff --git a/Commands/Moderation/CmdWarn.cs b/Commands/Moderation/CmdWarn.cs index e19139b72..c943696f8 100644 --- a/Commands/Moderation/CmdWarn.cs +++ b/Commands/Moderation/CmdWarn.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands if (message == "") { Help(p); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); // Make sure we have a valid player if (who == null) diff --git a/Commands/Moderation/CmdXban.cs b/Commands/Moderation/CmdXban.cs index 02ad06773..319bed033 100644 --- a/Commands/Moderation/CmdXban.cs +++ b/Commands/Moderation/CmdXban.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } string name = message.Split(' ')[0]; - Player who = Player.Find(name); + Player who = PlayerInfo.Find(name); Command.all.Find("ban").Use(p, message); Command.all.Find("banip").Use(p, "@" + name); if (who != null) diff --git a/Commands/Moderation/CmdXmute.cs b/Commands/Moderation/CmdXmute.cs index d6cce9ad8..fde85251f 100644 --- a/Commands/Moderation/CmdXmute.cs +++ b/Commands/Moderation/CmdXmute.cs @@ -42,7 +42,7 @@ namespace MCGalaxy.Commands } var split = message.Split(' '); - Player muter = Player.Find(split[0]); + Player muter = PlayerInfo.Find(split[0]); if (muter == null) { Player.SendMessage(p, "Player not found."); diff --git a/Commands/Moderation/CmdZone.cs b/Commands/Moderation/CmdZone.cs index 72ef3b0a3..bac1523dc 100644 --- a/Commands/Moderation/CmdZone.cs +++ b/Commands/Moderation/CmdZone.cs @@ -106,7 +106,7 @@ namespace MCGalaxy.Commands if (message.Split(' ')[0].ToLower() == "add") { - Player foundPlayer = Player.Find(message.Split(' ')[1]); + Player foundPlayer = PlayerInfo.Find(message.Split(' ')[1]); if (foundPlayer == null) cpos.Owner = message.Split(' ')[1].ToString(); else diff --git a/Commands/World/CmdEnvironment.cs b/Commands/World/CmdEnvironment.cs index c4b57bb69..42ef45b1a 100644 --- a/Commands/World/CmdEnvironment.cs +++ b/Commands/World/CmdEnvironment.cs @@ -118,7 +118,7 @@ namespace MCGalaxy.Commands { } void SendEnvColorPackets(Player p, byte envType, string value) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level) SendEnvColorPacket(pl, envType, value); } @@ -160,7 +160,7 @@ namespace MCGalaxy.Commands { p.SendMessage(string.Format("&aSet weather for {0}&a to {1} ({2}&a)", p.level.name, weather, weatherType)); // Send the changed colour to all players affected by the command. - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level && pl.HasCpeExt(CpeExt.EnvWeatherType)) pl.SendSetMapWeather(weather); } @@ -187,7 +187,7 @@ namespace MCGalaxy.Commands { } void SendCurrentMapAppearance(Level lvl) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2); if (hasExt && pl.level == lvl) pl.SendCurrentMapAppearance(); diff --git a/Commands/World/CmdGoto.cs b/Commands/World/CmdGoto.cs index 060ee0108..3e7fc2d32 100644 --- a/Commands/World/CmdGoto.cs +++ b/Commands/World/CmdGoto.cs @@ -86,7 +86,7 @@ namespace MCGalaxy.Commands { } p.Loading = true; - foreach (Player pl in Player.players) if (p.level == pl.level && p != pl) p.SendDespawn(pl.id); + foreach (Player pl in PlayerInfo.players) if (p.level == pl.level && p != pl) p.SendDespawn(pl.id); foreach (PlayerBot b in PlayerBot.playerbots) if (p.level == b.level) p.SendDespawn(b.id); Player.GlobalDespawn(p, true); @@ -104,7 +104,7 @@ namespace MCGalaxy.Commands { else p.SendPos(0xFF, x, y, z, lvl.rotx, lvl.roty); - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) if (pl.level == p.level && p != pl && !pl.hidden) p.SendSpawn(pl.id, pl.color + pl.name, pl.pos[0], pl.pos[1], pl.pos[2], pl.rot[0], pl.rot[1]); foreach (PlayerBot b in PlayerBot.playerbots) @@ -114,7 +114,7 @@ namespace MCGalaxy.Commands { p.Loading = false; bool unloadOld = true; if (oldLevel.unload && !oldLevel.name.Contains("&cMuseum ")) { - foreach (Player pl in Player.players) if (pl.level == oldLevel) { unloadOld = false; break; } + foreach (Player pl in PlayerInfo.players) if (pl.level == oldLevel) { unloadOld = false; break; } if (unloadOld && Server.AutoLoad) oldLevel.Unload(true); } diff --git a/Commands/World/CmdLockdown.cs b/Commands/World/CmdLockdown.cs index 529960e82..0a33d45cf 100644 --- a/Commands/World/CmdLockdown.cs +++ b/Commands/World/CmdLockdown.cs @@ -71,7 +71,7 @@ namespace MCGalaxy.Commands if (param[0] == "player") { - Player who = Player.Find(param[1]); + Player who = PlayerInfo.Find(param[1]); if (who == null) { diff --git a/Commands/World/CmdMuseum.cs b/Commands/World/CmdMuseum.cs index d51d267cf..3bff52b9a 100644 --- a/Commands/World/CmdMuseum.cs +++ b/Commands/World/CmdMuseum.cs @@ -58,7 +58,7 @@ namespace MCGalaxy.Commands level.jailrotx = level.rotx; level.jailroty = level.roty; p.Loading = true; - foreach (Player pl in Player.players) if (p.level == pl.level && p != pl) p.SendDespawn(pl.id); + foreach (Player pl in PlayerInfo.players) if (p.level == pl.level && p != pl) p.SendDespawn(pl.id); foreach (PlayerBot b in PlayerBot.playerbots) if (p.level == b.level) p.SendDespawn(b.id); Player.GlobalDespawn(p, true); diff --git a/Commands/World/CmdReload.cs b/Commands/World/CmdReload.cs index b5468bf3a..bc0691b61 100644 --- a/Commands/World/CmdReload.cs +++ b/Commands/World/CmdReload.cs @@ -42,7 +42,7 @@ namespace MCGalaxy.Commands { Player.SendMessage(p, "You cannot reload the main level."); return; } - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level.name.ToLower() != name.ToLower()) continue; CmdReveal.ReloadMap(p, pl, false); } diff --git a/Commands/World/CmdTexture.cs b/Commands/World/CmdTexture.cs index 57217f3a8..ab54a2151 100644 --- a/Commands/World/CmdTexture.cs +++ b/Commands/World/CmdTexture.cs @@ -84,7 +84,7 @@ namespace MCGalaxy.Commands { } void UpdateGlobally(Player p, bool zip) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2); string url = zip ? pl.level.texturePackUrl : pl.level.terrainUrl; if (hasExt && url == "") @@ -94,7 +94,7 @@ namespace MCGalaxy.Commands { } void UpdateLevel(Player p, bool zip) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2); if (hasExt && pl.level == p.level) pl.SendCurrentMapAppearance(); diff --git a/Commands/World/CmdUnlock.cs b/Commands/World/CmdUnlock.cs index 41a912644..ee742cd6f 100644 --- a/Commands/World/CmdUnlock.cs +++ b/Commands/World/CmdUnlock.cs @@ -68,7 +68,7 @@ namespace MCGalaxy.Commands { if (param[0] == "player") { - Player who = Player.Find(param[1]); + Player who = PlayerInfo.Find(param[1]); { if (who != null) { diff --git a/Commands/building/CmdUndo.cs b/Commands/building/CmdUndo.cs index 83459b42c..1620a1220 100644 --- a/Commands/building/CmdUndo.cs +++ b/Commands/building/CmdUndo.cs @@ -41,7 +41,7 @@ namespace MCGalaxy.Commands string[] parts = message.Split(' '); bool undoPhysics = parts[0].ToLower() == "physics"; - Player who = undoPhysics ? null : Player.Find(parts[0]); + Player who = undoPhysics ? null : PlayerInfo.Find(parts[0]); long seconds = GetSeconds(p, who, parts.Length > 1 ? parts[1] : "30"); if (parts.Length > 1 && parts[1].ToLower() == "update") { diff --git a/Commands/building/CustomBlockCommand.cs b/Commands/building/CustomBlockCommand.cs index 4bbd311e8..b3cbb434c 100644 --- a/Commands/building/CustomBlockCommand.cs +++ b/Commands/building/CustomBlockCommand.cs @@ -378,7 +378,7 @@ namespace MCGalaxy.Commands { } BlockDefinition.Add(def, defs, p == null ? null : p.level); - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!pl.HasCpeExt(CpeExt.BlockDefinitions)) continue; if (pl.level == null || !pl.level.HasCustomBlocks) continue; if (!global && p.level != pl.level) continue; diff --git a/Commands/other/CmdChangeLog.cs b/Commands/other/CmdChangeLog.cs index 8f2da6b8d..36952dfef 100644 --- a/Commands/other/CmdChangeLog.cs +++ b/Commands/other/CmdChangeLog.cs @@ -71,7 +71,7 @@ namespace MCGalaxy.Commands } else { - Player player = Player.Find(split[0]); + Player player = PlayerInfo.Find(split[0]); if (player == null) { Player.SendMessage(p, "Could not find player \"" + split[0] + "\"!"); diff --git a/Commands/other/CmdColor.cs b/Commands/other/CmdColor.cs index 3ca0960b3..494f3c56e 100644 --- a/Commands/other/CmdColor.cs +++ b/Commands/other/CmdColor.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } string[] args = message.Split(' '); - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } if (p != null && who.group.Permission > p.group.Permission) { Player.SendMessage(p, "Cannot change the color of someone of greater rank"); return; diff --git a/Commands/other/CmdFakerank.cs b/Commands/other/CmdFakerank.cs index 89c2e9b93..49e888f15 100644 --- a/Commands/other/CmdFakerank.cs +++ b/Commands/other/CmdFakerank.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands if (message == ""){Help(p); return;} - Player plr = Player.Find(message.Split (' ')[0]); + Player plr = PlayerInfo.Find(message.Split (' ')[0]); Group grp = Group.Find(message.Split (' ')[1]); if (plr == null) diff --git a/Commands/other/CmdGun.cs b/Commands/other/CmdGun.cs index cd6d9e869..d4ebdc566 100644 --- a/Commands/other/CmdGun.cs +++ b/Commands/other/CmdGun.cs @@ -242,7 +242,7 @@ namespace MCGalaxy.Commands allBlocks.Add(pos); bool comeOut = false; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level) { diff --git a/Commands/other/CmdImpersonate.cs b/Commands/other/CmdImpersonate.cs index a84b2db29..1b97d75a3 100644 --- a/Commands/other/CmdImpersonate.cs +++ b/Commands/other/CmdImpersonate.cs @@ -50,7 +50,7 @@ namespace MCGalaxy.Commands if ((message == "")) { this.Help(p); } else { - Player player = Player.Find(message.Split(' ')[0]); + Player player = PlayerInfo.Find(message.Split(' ')[0]); if (player != null) { if (p == null) { this.SendIt(p, message, player); } diff --git a/Commands/other/CmdInvincible.cs b/Commands/other/CmdInvincible.cs index 041c5ffd8..a385317e7 100644 --- a/Commands/other/CmdInvincible.cs +++ b/Commands/other/CmdInvincible.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands Player who; if (message != String.Empty) { - who = Player.Find(message); + who = PlayerInfo.Find(message); } else { diff --git a/Commands/other/CmdKill.cs b/Commands/other/CmdKill.cs index 4f7bd2129..869e1a26d 100644 --- a/Commands/other/CmdKill.cs +++ b/Commands/other/CmdKill.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands string killer = p == null ? "(console)" : p.color + p.DisplayName; string[] args = message.Split(trimChars, 2); - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); if (args.Length >= 2) { if(args[1].ToLower() == "explode") { deathMessage = " was exploded by " + killer; diff --git a/Commands/other/CmdLoginMessage.cs b/Commands/other/CmdLoginMessage.cs index 981f66221..017d37206 100644 --- a/Commands/other/CmdLoginMessage.cs +++ b/Commands/other/CmdLoginMessage.cs @@ -36,7 +36,7 @@ namespace MCGalaxy.Commands { string[] args = message.Split(trimChars, 2); if (args.Length < 2) { Help(p); return; } - Player target = Player.Find(args[0]); + Player target = PlayerInfo.Find(args[0]); string name = target != null ? target.name : args[0]; if (!File.Exists("text/login/" + name + ".txt")) { diff --git a/Commands/other/CmdLogoutMessage.cs b/Commands/other/CmdLogoutMessage.cs index 0c35f56db..ab0b89465 100644 --- a/Commands/other/CmdLogoutMessage.cs +++ b/Commands/other/CmdLogoutMessage.cs @@ -36,7 +36,7 @@ namespace MCGalaxy.Commands { string[] args = message.Split(trimChars, 2); if (args.Length < 2) { Help(p); return; } - Player target = Player.Find(args[0]); + Player target = PlayerInfo.Find(args[0]); string name = target != null ? target.name : args[0]; if (!File.Exists("text/logout/" + name + ".txt")) { diff --git a/Commands/other/CmdMissile.cs b/Commands/other/CmdMissile.cs index 07aab5ea2..af40fa996 100644 --- a/Commands/other/CmdMissile.cs +++ b/Commands/other/CmdMissile.cs @@ -237,7 +237,7 @@ namespace MCGalaxy.Commands } bool comeInner = false; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level && pl != p) { @@ -308,7 +308,7 @@ namespace MCGalaxy.Commands allBlocks.Add(pos); bool comeOut = false; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level && pl != p) { diff --git a/Commands/other/CmdMove.cs b/Commands/other/CmdMove.cs index d7603299e..422999683 100644 --- a/Commands/other/CmdMove.cs +++ b/Commands/other/CmdMove.cs @@ -47,7 +47,7 @@ namespace MCGalaxy.Commands if (param.Length == 2) // /move name map { - Player who = Player.Find(param[0]); + Player who = PlayerInfo.Find(param[0]); Level where = Level.Find(param[1]); if (who == null) { Player.SendMessage(p, "Could not find player specified"); return; } if (where == null) { Player.SendMessage(p, "Could not find level specified"); return; } @@ -68,7 +68,7 @@ namespace MCGalaxy.Commands if (param.Length == 4) { - who = Player.Find(param[0]); + who = PlayerInfo.Find(param[0]); if (who == null) { Player.SendMessage(p, "Could not find player specified"); return; } if (p != null && who.group.Permission > p.group.Permission) { Player.SendMessage(p, "Cannot move someone of greater rank"); return; } message = message.Substring(message.IndexOf(' ') + 1); diff --git a/Commands/other/CmdNick.cs b/Commands/other/CmdNick.cs index 685ffbd65..c9d68ab63 100644 --- a/Commands/other/CmdNick.cs +++ b/Commands/other/CmdNick.cs @@ -34,7 +34,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } string[] parts = message.Split(trimChars, 2); - Player who = Player.Find(parts[0]); + Player who = PlayerInfo.Find(parts[0]); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } if (p != null && who.group.Permission > p.group.Permission) { Player.SendMessage(p, "Cannot change the nick of someone of greater rank"); return; diff --git a/Commands/other/CmdResetPass.cs b/Commands/other/CmdResetPass.cs index 9b83b3d1f..b3f3337a2 100644 --- a/Commands/other/CmdResetPass.cs +++ b/Commands/other/CmdResetPass.cs @@ -37,7 +37,7 @@ namespace MCGalaxy.Commands public override void Use(Player p, string message) { if (message == "") { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (Server.server_owner == "Notch" || Server.server_owner == "") { Player.SendMessage(p, "Please tell the server owner to change the 'Server Owner' property."); diff --git a/Commands/other/CmdReview.cs b/Commands/other/CmdReview.cs index 8d0c32141..416dd6ff5 100644 --- a/Commands/other/CmdReview.cs +++ b/Commands/other/CmdReview.cs @@ -68,7 +68,7 @@ namespace MCGalaxy.Commands bool isopson = false; try { - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.group.Permission >= Server.opchatperm && !pl.hidden) { @@ -194,7 +194,7 @@ namespace MCGalaxy.Commands int toallplayerscount = 1; foreach (string toallplayers in Server.reviewlist) { - Player tosend = Player.Find(toallplayers); + Player tosend = PlayerInfo.Find(toallplayers); Player.SendMessage(tosend, "The review queue has changed. Your now on spot " + toallplayerscount.ToString() + "."); toallplayerscount++; } @@ -228,7 +228,7 @@ namespace MCGalaxy.Commands return; } string[] user = Server.reviewlist.ToArray(); - Player who = Player.Find(user[0]); + Player who = PlayerInfo.Find(user[0]); if (who == null) { Player.SendMessage(p, "Player " + user[0] + " doesn't exist or is offline. " + user[0] + " has been removed from the review queue"); @@ -248,7 +248,7 @@ namespace MCGalaxy.Commands int toallplayerscount = 0; foreach (string toallplayers in Server.reviewlist) { - Player who2 = Player.Find(toallplayers); + Player who2 = PlayerInfo.Find(toallplayers); Player.SendMessage(who2, "The review queue has been rotated. you now have " + toallplayerscount.ToString() + " players waiting in front of you"); toallplayerscount++; } diff --git a/Commands/other/CmdSend.cs b/Commands/other/CmdSend.cs index d2a69167d..009e79531 100644 --- a/Commands/other/CmdSend.cs +++ b/Commands/other/CmdSend.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands { if (message == "" || message.IndexOf(' ') == -1) { Help(p); return; } - Player who = Player.Find(message.Split(' ')[0]); + Player who = PlayerInfo.Find(message.Split(' ')[0]); string whoTo, fromname; if (who != null) whoTo = who.name; diff --git a/Commands/other/CmdSendCmd.cs b/Commands/other/CmdSendCmd.cs index f0c03a9fe..1f2738b10 100644 --- a/Commands/other/CmdSendCmd.cs +++ b/Commands/other/CmdSendCmd.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands int length = message.Split().Length; Player player = null; if (length >= 1) - player = Player.Find(message.Split(' ')[0]); + player = PlayerInfo.Find(message.Split(' ')[0]); else return; if (player == null) { diff --git a/Commands/other/CmdSummon.cs b/Commands/other/CmdSummon.cs index cf06a4fea..f736fd737 100644 --- a/Commands/other/CmdSummon.cs +++ b/Commands/other/CmdSummon.cs @@ -36,7 +36,7 @@ namespace MCGalaxy.Commands { try { - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.level == p.level && pl != p && p.group.Permission > pl.group.Permission) { @@ -53,7 +53,7 @@ namespace MCGalaxy.Commands return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || who.hidden) { Player.SendMessage(p, "There is no player \"" + message + "\"!"); return; } if (p.group.Permission < who.group.Permission) { diff --git a/Commands/other/CmdTColor.cs b/Commands/other/CmdTColor.cs index 5226de86a..4b32992cb 100644 --- a/Commands/other/CmdTColor.cs +++ b/Commands/other/CmdTColor.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } string[] args = message.Split(' '); - Player who = Player.Find(args[0]); + Player who = PlayerInfo.Find(args[0]); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } if (p != null && who.group.Permission > p.group.Permission) { Player.SendMessage(p, "Cannot change the title color of someone of greater rank"); return; diff --git a/Commands/other/CmdTake.cs b/Commands/other/CmdTake.cs index d1b116ee5..e48234187 100644 --- a/Commands/other/CmdTake.cs +++ b/Commands/other/CmdTake.cs @@ -52,12 +52,12 @@ namespace MCGalaxy.Commands if (amountTaken < 0) { Player.SendMessage(p, "%cYou can't take negative %3" + Server.moneys); return; } - Player who = Player.Find(message.Split()[0]); + Player who = PlayerInfo.Find(message.Split()[0]); Economy.EcoStats ecos; if (who == null) { //player is offline - Player.OfflinePlayer off = Player.FindOffline(message.Split()[0]); - if (off.name == "") { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } + OfflinePlayer off = PlayerInfo.FindOffline(message.Split()[0]); + if (off == null) { Player.SendMessage(p, "%cThe player %f" + message.Split()[0] + Server.DefaultColor + "(offline)%c does not exist or has never logged on to this server"); return; } ecos = Economy.RetrieveEcoStats(message.Split()[0]); if (all || ecos.money - amountTaken < 0) { diff --git a/Commands/other/CmdTitle.cs b/Commands/other/CmdTitle.cs index 987af334e..c505280e1 100644 --- a/Commands/other/CmdTitle.cs +++ b/Commands/other/CmdTitle.cs @@ -32,7 +32,7 @@ namespace MCGalaxy.Commands { if (message == "") { Help(p); return; } string[] parts = message.Split(trimChars, 2); - Player who = Player.Find(parts[0]); + Player who = PlayerInfo.Find(parts[0]); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } if (p != null && who.group.Permission > p.group.Permission) { Player.SendMessage(p, "Cannot change the title of someone of greater rank"); return; diff --git a/Commands/other/CmdTp.cs b/Commands/other/CmdTp.cs index 348c1a20b..515631016 100644 --- a/Commands/other/CmdTp.cs +++ b/Commands/other/CmdTp.cs @@ -46,7 +46,7 @@ namespace MCGalaxy.Commands } if (number == 1) { - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == null || (who.hidden && p.group.Permission < LevelPermission.Admin)) { Player.SendMessage(p, "There is no player \"" + message + "\"!"); return; } if (p.level != who.level) { diff --git a/Commands/other/CmdTpA.cs b/Commands/other/CmdTpA.cs index e7df3fe51..12df4b766 100644 --- a/Commands/other/CmdTpA.cs +++ b/Commands/other/CmdTpA.cs @@ -20,7 +20,7 @@ namespace MCGalaxy.Commands { int number = message.Split(' ').Length; if (number > 1) { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); if (who == p) { Player.SendMessage(p, "&cError:" + Server.DefaultColor + " You cannot send yourself a request!"); return; } if (who == null || (who.hidden && p.group.Permission < LevelPermission.Admin)) { Player.SendMessage(p, "There is no player \"" + message + "\"!"); return; } if (who.listignored.Contains(p.name)) @@ -87,7 +87,7 @@ namespace MCGalaxy.Commands { Player.SendMessage(p, "&cError:" + Server.DefaultColor + " You do not have any pending teleport requests!"); return; } - Player who = Player.Find(p.senderName); + Player who = PlayerInfo.Find(p.senderName); p.Request = false; p.senderName = ""; if (who == null) { @@ -129,7 +129,7 @@ namespace MCGalaxy.Commands { Player.SendMessage(p, "&cError:" + Server.DefaultColor + " You do not have any pending teleport requests!"); return; } - Player who = Player.Find(p.senderName); + Player who = PlayerInfo.Find(p.senderName); p.Request = false; p.senderName = ""; if (who == null) { diff --git a/Commands/other/CmdView.cs b/Commands/other/CmdView.cs index b69d1664e..50a945e20 100644 --- a/Commands/other/CmdView.cs +++ b/Commands/other/CmdView.cs @@ -69,7 +69,7 @@ namespace MCGalaxy.Commands Player who = null; if (message.IndexOf(' ') != -1) { - who = Player.Find(message.Split(' ')[message.Split(' ').Length - 1]); + who = PlayerInfo.Find(message.Split(' ')[message.Split(' ').Length - 1]); if (who != null) message = message.Substring(0, message.LastIndexOf(' ')); } diff --git a/Commands/other/CmdVote.cs b/Commands/other/CmdVote.cs index e98fd079c..8857514c5 100644 --- a/Commands/other/CmdVote.cs +++ b/Commands/other/CmdVote.cs @@ -37,7 +37,7 @@ namespace MCGalaxy.Commands Server.voting = false; Player.GlobalMessage("The votes are in! " + Colors.green + "Y: " + Server.YesVotes + Colors.red + " N: " + Server.NoVotes); - Player.players.ForEach(pl => pl.voted = false); + PlayerInfo.players.ForEach(pl => pl.voted = false); } else{ p.SendMessage("A vote is in progress!"); } diff --git a/Commands/other/CmdWarp.cs b/Commands/other/CmdWarp.cs index 2a44539c1..80c079cb7 100644 --- a/Commands/other/CmdWarp.cs +++ b/Commands/other/CmdWarp.cs @@ -62,7 +62,7 @@ namespace MCGalaxy.Commands if (Warp.WarpExists(par1)) { Player.SendMessage(p, "Warp has already been created!!"); return; } { if (par2 == null) { Warp.AddWarp(par1, p); } - else { Warp.AddWarp(par1, Player.Find(par2)); } + else { Warp.AddWarp(par1, PlayerInfo.Find(par2)); } } { if (Warp.WarpExists(par1)) @@ -113,7 +113,7 @@ namespace MCGalaxy.Commands if (!Warp.WarpExists(par1)) { Player.SendMessage(p, "Warp doesn't exist!!"); return; } { if (par2 == null) { Warp.MoveWarp(par1, p); } - else { Warp.MoveWarp(par1, Player.Find(par2)); } + else { Warp.MoveWarp(par1, PlayerInfo.Find(par2)); } } { if (Warp.WarpExists(par1)) diff --git a/Commands/other/CmdXJail.cs b/Commands/other/CmdXJail.cs index dbfe7b06d..632c0f2b8 100644 --- a/Commands/other/CmdXJail.cs +++ b/Commands/other/CmdXJail.cs @@ -67,7 +67,7 @@ namespace MCGalaxy.Commands } else { - Player player = Player.Find(message); + Player player = PlayerInfo.Find(message); if (player != null) { diff --git a/Commands/other/CmdXspawn.cs b/Commands/other/CmdXspawn.cs index 1f725da4b..eef1373b3 100644 --- a/Commands/other/CmdXspawn.cs +++ b/Commands/other/CmdXspawn.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Operator; } } public override void Use(Player p, string message) { - Player player = Player.Find(message.Split(' ')[0]); + Player player = PlayerInfo.Find(message.Split(' ')[0]); if (player == null) { Player.SendMessage(p, "Error: " + player.color + player.name + Server.DefaultColor + " was not found"); diff --git a/Commands/other/CmdXundo.cs b/Commands/other/CmdXundo.cs index 76f77496d..95c6a772f 100644 --- a/Commands/other/CmdXundo.cs +++ b/Commands/other/CmdXundo.cs @@ -33,7 +33,7 @@ namespace MCGalaxy.Commands int number = message.Split(' ').Length; if (number != 1) { Help(p); return; } - Player who = Player.Find(message); + Player who = PlayerInfo.Find(message); string error = "You are not allowed to undo this player"; diff --git a/Commands/other/cmdCTFADSFD.cs b/Commands/other/cmdCTFADSFD.cs index 128b6e760..b75c7d00a 100644 --- a/Commands/other/cmdCTFADSFD.cs +++ b/Commands/other/cmdCTFADSFD.cs @@ -61,7 +61,7 @@ namespace MCGalaxy.Commands else if (message.Split(' ')[1].ToLower() == "add") { if (message.Split(' ').Length < 4) { Help(p); return; } - Player newPlayer = Player.Find(message.Split(' ')[2].ToLower()); + Player newPlayer = PlayerInfo.Find(message.Split(' ')[2].ToLower()); if (newPlayer == null) { Help(p); return; } string color = c.Parse(message.Split(' ')[3].ToLower()); AddTeamMember(p, newPlayer, color); @@ -70,7 +70,7 @@ namespace MCGalaxy.Commands else if (message.Split(' ')[1].ToLower() == "remove") { if (message.Split(' ').Length < 3) { Help(p); return; } - Player newPlayer = Player.Find(message.Split(' ')[2].ToLower()); + Player newPlayer = PlayerInfo.Find(message.Split(' ')[2].ToLower()); Team workTeam = newPlayer.level.teams.Find(team => team.color == newPlayer.onTeam); workTeam.removePlayer(newPlayer); if (newPlayer == null) { Help(p); return; } diff --git a/Drawing/DrawOps/DrawOp.cs b/Drawing/DrawOps/DrawOp.cs index 8322e365a..55792d159 100644 --- a/Drawing/DrawOps/DrawOp.cs +++ b/Drawing/DrawOps/DrawOp.cs @@ -107,7 +107,7 @@ namespace MCGalaxy { bool needReveal = op.DetermineDrawOpMethod(p.level, affected); op.Perform(x1, y1, z1, x2, y2, z2, p, p.level, brush); if (needReveal) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level.name.ToLower() == p.level.name.ToLower()) Command.all.Find("reveal").Use(p, pl.name); } diff --git a/GUI/Program.cs b/GUI/Program.cs index deb1ea8b5..2e42ffc17 100644 --- a/GUI/Program.cs +++ b/GUI/Program.cs @@ -527,8 +527,8 @@ namespace MCGalaxy_.Gui if (Server.lava.active && Server.lava.HasMap(l.name)) l.saveChanges(); else l.Save(); - if (Player.players != null && Player.players.Any()) - foreach (Player pl in Player.players) pl.save(); + if (PlayerInfo.players != null && PlayerInfo.players.Any()) + foreach (Player pl in PlayerInfo.players) pl.save(); if (!usingConsole) Process.Start("Updater.exe", "securitycheck10934579068013978427893755755270374" + parent); @@ -595,7 +595,7 @@ namespace MCGalaxy_.Gui try { List kickList = new List(); - kickList.AddRange(Player.players); + kickList.AddRange(PlayerInfo.players); foreach (Player p in kickList) { if (restarting) diff --git a/GUI/Window.cs b/GUI/Window.cs index daf469ab4..e9a019ca3 100644 --- a/GUI/Window.cs +++ b/GUI/Window.cs @@ -133,7 +133,7 @@ namespace MCGalaxy.Gui { UpdateListTimer.Elapsed += delegate { - UpdateClientList(Player.players); + UpdateClientList(PlayerInfo.players); UpdateMapList("'"); Server.s.Log("Lists updated!"); }; UpdateListTimer.Start(); @@ -143,7 +143,7 @@ namespace MCGalaxy.Gui { try { - UpdateClientList(Player.players); + UpdateClientList(PlayerInfo.players); UpdateMapList(); } catch { } // needed for slower computers @@ -337,14 +337,14 @@ namespace MCGalaxy.Gui //dgvPlayers.SuspendLayout(); pc = new PlayerCollection(new PlayerListView()); - Player.players.ForEach(p => pc.Add(p)); + PlayerInfo.players.ForEach(p => pc.Add(p)); //dgvPlayers.Invalidate(); dgvPlayers.DataSource = pc; // Reselect player if (selected != null) { - foreach (Player t in Player.players) + foreach (Player t in PlayerInfo.players) for (int j = 0; j < dgvPlayers.Rows.Count; j++) if (Equals(dgvPlayers.Rows[j].Cells[0].Value, selected)) dgvPlayers.Rows[j].Selected = true; @@ -995,7 +995,7 @@ namespace MCGalaxy.Gui #region playersTab private void LoadPLayerTabDetails(object sender, EventArgs e) { - Player p = Player.Find(PlyersListBox.Text); + Player p = PlayerInfo.Find(PlyersListBox.Text); if (p != null) { PlayersTextBox.AppendTextAndScroll("==" + p.name + "=="); @@ -1154,7 +1154,7 @@ namespace MCGalaxy.Gui private void LoginBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1166,7 +1166,7 @@ namespace MCGalaxy.Gui private void LogoutBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1178,7 +1178,7 @@ namespace MCGalaxy.Gui private void TitleBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1190,7 +1190,7 @@ namespace MCGalaxy.Gui private void ColorBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1254,7 +1254,7 @@ namespace MCGalaxy.Gui private void MapBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1286,7 +1286,7 @@ namespace MCGalaxy.Gui private void UndoBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1313,7 +1313,7 @@ namespace MCGalaxy.Gui private void MessageBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1325,7 +1325,7 @@ namespace MCGalaxy.Gui private void ImpersonateORSendCmdBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1367,7 +1367,7 @@ namespace MCGalaxy.Gui private void PromoteBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1379,7 +1379,7 @@ namespace MCGalaxy.Gui private void DemoteBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1391,7 +1391,7 @@ namespace MCGalaxy.Gui private void HideBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1413,7 +1413,7 @@ namespace MCGalaxy.Gui private void SlapBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1424,7 +1424,7 @@ namespace MCGalaxy.Gui private void JokerBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1446,7 +1446,7 @@ namespace MCGalaxy.Gui private void FreezeBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1468,7 +1468,7 @@ namespace MCGalaxy.Gui private void MuteBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1490,7 +1490,7 @@ namespace MCGalaxy.Gui private void VoiceBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1512,7 +1512,7 @@ namespace MCGalaxy.Gui private void KillBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1524,7 +1524,7 @@ namespace MCGalaxy.Gui private void JailBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1546,7 +1546,7 @@ namespace MCGalaxy.Gui private void WarnBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1558,7 +1558,7 @@ namespace MCGalaxy.Gui private void KickBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1570,7 +1570,7 @@ namespace MCGalaxy.Gui private void BanBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1582,7 +1582,7 @@ namespace MCGalaxy.Gui private void IPBanBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1594,7 +1594,7 @@ namespace MCGalaxy.Gui private void SendRulesTxt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1620,7 +1620,7 @@ namespace MCGalaxy.Gui private void SpawnBt_Click(object sender, EventArgs e) { - if (prpertiesofplyer == null || !Player.players.Contains(prpertiesofplyer)) + if (prpertiesofplyer == null || !PlayerInfo.players.Contains(prpertiesofplyer)) { PlayersTextBox.AppendTextAndScroll("No Player Selected"); return; @@ -1640,7 +1640,7 @@ namespace MCGalaxy.Gui { PlyersListBox.Items.Clear(); - foreach (Player p in Player.players) + foreach (Player p in PlayerInfo.players) { PlyersListBox.Items.Add(p.name); } diff --git a/Games/CTF/Auto_CTF.cs b/Games/CTF/Auto_CTF.cs index c12b7baf0..6c535489a 100644 --- a/Games/CTF/Auto_CTF.cs +++ b/Games/CTF/Auto_CTF.cs @@ -277,7 +277,7 @@ namespace MCGalaxy } void tagging_Elapsed(object sender, System.Timers.ElapsedEventArgs e) { - Player.players.ForEach(delegate(Player p) + PlayerInfo.players.ForEach(delegate(Player p) { if (p.level == mainlevel) { @@ -695,7 +695,7 @@ namespace MCGalaxy { if (blueteam.members.Contains(p)) { - Player.players.ForEach(delegate(Player p1) + PlayerInfo.players.ForEach(delegate(Player p1) { if (blueteam.members.Contains(p1)) Player.SendMessage(p1, "(Blue) " + p.color + p.name + ":&f " + message); @@ -704,7 +704,7 @@ namespace MCGalaxy } if (redteam.members.Contains(p)) { - Player.players.ForEach(delegate(Player p1) + PlayerInfo.players.ForEach(delegate(Player p1) { if (redteam.members.Contains(p1)) Player.SendMessage(p1, "(Red) " + p.color + p.name + ":&f " + message); diff --git a/Games/CountdownGame.cs b/Games/CountdownGame.cs index 62fffcad1..cb73f7204 100644 --- a/Games/CountdownGame.cs +++ b/Games/CountdownGame.cs @@ -669,7 +669,7 @@ namespace MCGalaxy } } gamestatus = CountdownGameStatus.Enabled; - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.playerofcountdown) { @@ -701,7 +701,7 @@ namespace MCGalaxy playersleft = 0; playersleftlist.Clear(); players.Clear(); - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { pl.playerofcountdown = false; pl.incountdown = false; @@ -732,7 +732,7 @@ namespace MCGalaxy public void MessagePlayers(string message) { - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { if (pl.playerofcountdown) { diff --git a/Games/LavaSurvival.cs b/Games/LavaSurvival.cs index ae26ce7b8..b7a82f83d 100644 --- a/Games/LavaSurvival.cs +++ b/Games/LavaSurvival.cs @@ -300,7 +300,7 @@ namespace MCGalaxy sendingPlayers = true; try { - Player.players.ForEach(delegate(Player pl) + PlayerInfo.players.ForEach(delegate(Player pl) { if (pl.level == oldMap) { @@ -423,7 +423,7 @@ namespace MCGalaxy { if (OnPlayerDeath != null) OnPlayerDeath(p); - Player.players.ForEach(delegate(Player pl) + PlayerInfo.players.ForEach(delegate(Player pl) { if (pl != p && HasPlayer(pl)) Player.SendMessage(pl, p.color + p.name + " &4ran out of lives, and is out of the round!"); diff --git a/Games/ZombieSurvival/ZombieGame.cs b/Games/ZombieSurvival/ZombieGame.cs index 5dafbd08b..0a80f266c 100644 --- a/Games/ZombieSurvival/ZombieGame.cs +++ b/Games/ZombieSurvival/ZombieGame.cs @@ -115,7 +115,7 @@ namespace MCGalaxy Thread.Sleep(1000); if (!Server.ZombieModeOn) { return; } Server.zombieRound = true; int playerscountminusref = 0; List players = new List(); - foreach (Player playere in Player.players) + foreach (Player playere in PlayerInfo.players) { if (playere.referee) { @@ -142,7 +142,7 @@ namespace MCGalaxy int firstinfect = random.Next(players.Count()); Player player = null; if (Server.queZombie) - player = Player.Find(Server.nextZombie); + player = PlayerInfo.Find(Server.nextZombie); else player = players[firstinfect]; @@ -163,7 +163,7 @@ namespace MCGalaxy timer.Elapsed += new ElapsedEventHandler(EndRound); timer.Enabled = true; - foreach (Player playaboi in Player.players) + foreach (Player playaboi in PlayerInfo.players) { if(playaboi != player) alive.Add(playaboi); @@ -171,7 +171,7 @@ namespace MCGalaxy infectd.Clear(); if (Server.queZombie) - infectd.Add(Player.Find(Server.nextZombie)); + infectd.Add(PlayerInfo.Find(Server.nextZombie)); else infectd.Add(player); aliveCount = alive.Count; @@ -285,7 +285,7 @@ namespace MCGalaxy string playersString = ""; if (aliveCount == 0) { - foreach (Player winners in Player.players) + foreach (Player winners in PlayerInfo.players) { if (winners.level.name == currentLevelName) { @@ -315,7 +315,7 @@ namespace MCGalaxy }); } Player.GlobalMessage(playersString); - foreach (Player winners in Player.players) + foreach (Player winners in PlayerInfo.players) { if (!winners.CheckIfInsideBlock() && aliveCount == 0 && winners.level.name == currentLevelName) { @@ -354,7 +354,7 @@ namespace MCGalaxy } } try {alive.Clear(); infectd.Clear(); } catch{ } - foreach (Player player in Player.players) + foreach (Player player in PlayerInfo.players) { player.infected = false; player.color = player.group.color; @@ -461,7 +461,7 @@ namespace MCGalaxy } ChangeLevel(selectedLevel2, Server.ZombieOnlyServer); } - Player.players.ForEach(delegate(Player winners) + PlayerInfo.players.ForEach(delegate(Player winners) { winners.voted = false; }); @@ -566,7 +566,7 @@ namespace MCGalaxy if (changeMainLevel) { Server.mainLevel = Level.Find(next.ToLower()); - Player.players.ForEach(delegate(Player player) + PlayerInfo.players.ForEach(delegate(Player player) { if (player.level.name != next && player.level.name == currentLevelName) { diff --git a/IRC/GlobalChatBot.cs b/IRC/GlobalChatBot.cs index 1f82716eb..d499dda44 100644 --- a/IRC/GlobalChatBot.cs +++ b/IRC/GlobalChatBot.cs @@ -256,7 +256,7 @@ namespace MCGalaxy //} if (message.Contains("^IPGET ")) { - foreach (Player p in Player.players) + foreach (Player p in PlayerInfo.players) { if (p.name == message.Split(' ')[1]) { @@ -274,7 +274,7 @@ namespace MCGalaxy } if (message.Contains("^SENDRULES ")) { - Player who = Player.Find(message.Split(' ')[1]); + Player who = PlayerInfo.Find(message.Split(' ')[1]); if (who != null) { Command.all.Find("gcrules").Use(who, ""); @@ -290,7 +290,7 @@ namespace MCGalaxy connection.Sender.PublicMessage(channel, "^MOTD: " + Server.motd); connection.Sender.PublicMessage(channel, "^VERSION: " + Server.VersionString); connection.Sender.PublicMessage(channel, "^URL: " + Server.URL); - connection.Sender.PublicMessage(channel, "^PLAYERS: " + Player.players.Count + "/" + Server.players); + connection.Sender.PublicMessage(channel, "^PLAYERS: " + PlayerInfo.players.Count + "/" + Server.players); } } } diff --git a/Levels/BlockDefinitions.cs b/Levels/BlockDefinitions.cs index 1b3147999..e21600d27 100644 --- a/Levels/BlockDefinitions.cs +++ b/Levels/BlockDefinitions.cs @@ -121,7 +121,7 @@ namespace MCGalaxy { } defs[id] = def; - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!global && pl.level != level) continue; if (!pl.HasCpeExt(CpeExt.BlockDefinitions)) continue; if (global && pl.level.CustomBlockDefs[id] != GlobalDefs[id]) continue; @@ -150,7 +150,7 @@ namespace MCGalaxy { } defs[id] = null; - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (!global && pl.level != level) continue; if (global && pl.level.CustomBlockDefs[id] != null) continue; diff --git a/Levels/Level.cs b/Levels/Level.cs index c60b5c853..984b2d1a3 100644 --- a/Levels/Level.cs +++ b/Levels/Level.cs @@ -292,7 +292,7 @@ namespace MCGalaxy cancelunload = false; return false; } - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player pl) { if (pl.level == this) Command.all.Find("goto").Use(pl, Server.mainLevel.name); }); if (changed && (!Server.ZombieModeOn || !Server.noLevelSaving)) @@ -442,7 +442,7 @@ namespace MCGalaxy SaveSettings(this); Server.s.Log(string.Format("SAVED: Level \"{0}\". ({1}/{2}/{3})", name, players.Count, - Player.players.Count, Server.players)); + PlayerInfo.players.Count, Server.players)); changed = false; } else @@ -695,7 +695,7 @@ namespace MCGalaxy public void ChatLevelAdmins(string message) { ChatLevel(message, Server.adminchatperm); } public void ChatLevel(string message, LevelPermission minPerm) { - foreach (Player pl in Player.players) { + foreach (Player pl in PlayerInfo.players) { if (pl.level != this) continue; if (pl.group.Permission < minPerm) continue; pl.SendMessage(message); @@ -703,7 +703,7 @@ namespace MCGalaxy } public void UpdateBlockPermissions() { - foreach (Player p in Player.players) { + foreach (Player p in PlayerInfo.players) { if (p.level != this) continue; if (!p.HasCpeExt(CpeExt.BlockPermissions)) continue; p.SendCurrentBlockPermissions(); @@ -792,7 +792,7 @@ namespace MCGalaxy } else { - foreach (Player p in Player.players.Where(p => p.level == this)) + foreach (Player p in PlayerInfo.players.Where(p => p.level == this)) { Player.SendMessage(p, "Physics warning!"); } @@ -826,7 +826,7 @@ namespace MCGalaxy public List getPlayers() { - return Player.players.Where(p => p.level == this).ToList(); + return PlayerInfo.players.Where(p => p.level == this).ToList(); } #region ==Physics== diff --git a/Levels/Physics/AIPhysics.cs b/Levels/Physics/AIPhysics.cs index cdcd9a519..ece2f3d84 100644 --- a/Levels/Physics/AIPhysics.cs +++ b/Levels/Physics/AIPhysics.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.BlockPhysics { ushort x, y, z; lvl.IntToPos(C.b, out x, out y, out z); - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if (p.level == lvl && !p.invincible) { diff --git a/Levels/Physics/TntPhysics.cs b/Levels/Physics/TntPhysics.cs index 1d1b33624..8ebd759b6 100644 --- a/Levels/Physics/TntPhysics.cs +++ b/Levels/Physics/TntPhysics.cs @@ -79,7 +79,7 @@ namespace MCGalaxy.BlockPhysics { lvl.MakeExplosion(x, y, z, power - 2, true, TntWarsGame.GetTntWarsGame(C.p)); List Killed = new List(); - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p1) { if (p1.level == lvl && p1.PlayingTntWars && p1 != C.p diff --git a/MCGalaxy_.csproj b/MCGalaxy_.csproj index b76cfbc4b..42a00406d 100644 --- a/MCGalaxy_.csproj +++ b/MCGalaxy_.csproj @@ -428,6 +428,7 @@ + diff --git a/Network/ClassiCube.cs b/Network/ClassiCube.cs index f0c570c67..4efa3d1c9 100644 --- a/Network/ClassiCube.cs +++ b/Network/ClassiCube.cs @@ -42,7 +42,7 @@ namespace MCGalaxy "&public=" + Server.pub + "&version=7" + "&salt=" + Server.salt + - "&users=" + Player.players.Count + "&software=MCGalaxy"; + "&users=" + PlayerInfo.players.Count + "&software=MCGalaxy"; } public bool UrlSaid = false; diff --git a/Network/Player.Networking.cs b/Network/Player.Networking.cs index 2b891afd1..d274d0113 100644 --- a/Network/Player.Networking.cs +++ b/Network/Player.Networking.cs @@ -662,7 +662,7 @@ namespace MCGalaxy { if (packet == null) return; try { - foreach (Player p in players) { + foreach (Player p in PlayerInfo.players) { if (p != this && p.level == level) p.SendRaw(packet); } diff --git a/Player/Chat.cs b/Player/Chat.cs index c0444292c..6ef83e0cd 100644 --- a/Player/Chat.cs +++ b/Player/Chat.cs @@ -26,7 +26,7 @@ namespace MCGalaxy { if (showname) { message = "" + from.color + from.voicestring + from.color + from.prefix + from.name + ": &f" + message; } - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if (p.level == from.level && p.Chatroom == null) SendGlobalMessage(p, from, message); @@ -38,7 +38,7 @@ namespace MCGalaxy { if ( showname ) { message = " " + from.color + from.voicestring + from.color + from.prefix + from.name + ": &f" + message; } - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if ( p.Chatroom != null ) SendGlobalMessage(p, from, message); @@ -52,12 +52,12 @@ namespace MCGalaxy { if ( showname ) { message = " " + from.color + from.voicestring + from.color + from.prefix + from.name + ": &f" + message; } - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if (p.Chatroom == chatroom) SendGlobalMessage(p, from, message); }); - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if ( p.spyChatRooms.Contains(chatroom) && p.Chatroom != chatroom ) SendGlobalMessage(p, from, message); @@ -69,7 +69,7 @@ namespace MCGalaxy { if ( showname ) { message = "" + from.color + from.voicestring + from.color + from.prefix + from.name + ": &f" + message; } - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if ( p.level.worldChat && p.Chatroom == null ) SendGlobalMessage(p, from, message); @@ -77,7 +77,7 @@ namespace MCGalaxy { } public static void GlobalMessageLevel(Level l, string message) { - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if ( p.level == l && p.Chatroom == null ) Player.SendMessage(p, message); @@ -85,7 +85,7 @@ namespace MCGalaxy { } public static void GlobalMessageOps(string message) { - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if (p.group.Permission >= Server.opchatperm) Player.SendMessage(p, message); @@ -93,7 +93,7 @@ namespace MCGalaxy { } public static void GlobalMessageAdmins(string message) { - Player.players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if (p.group.Permission >= Server.adminchatperm) Player.SendMessage(p, message); @@ -212,7 +212,7 @@ namespace MCGalaxy { } static void HandleWhisper(Player p, string target, string message) { - Player who = Player.Find(target); + Player who = PlayerInfo.Find(target); if (who == null) { Player.SendMessage(p, "Could not find player."); return; } if (who == p) { Player.SendMessage(p, "Trying to talk to yourself, huh?"); return; } diff --git a/Player/Group/Group.cs b/Player/Group/Group.cs index 93273b940..84685aaf9 100644 --- a/Player/Group/Group.cs +++ b/Player/Group/Group.cs @@ -128,7 +128,7 @@ namespace MCGalaxy if (Group.Find(Server.defaultRank) != null) standard = Group.Find(Server.defaultRank); else standard = Group.findPerm(LevelPermission.Guest); - foreach (Player pl in Player.players) + foreach (Player pl in PlayerInfo.players) { pl.group = GroupList.Find(g => g.name == pl.group.name); } diff --git a/Player/Player.CPE.cs b/Player/Player.CPE.cs index c570687ca..6d3d51d2a 100644 --- a/Player/Player.CPE.cs +++ b/Player/Player.CPE.cs @@ -62,7 +62,7 @@ namespace MCGalaxy ExtPlayerList = version; spawned = true; if (version > 0) - Player.players.ForEach(delegate(Player p) + PlayerInfo.players.ForEach(delegate(Player p) { if (p.HasExtension("ExtPlayerList", 2) && p != this) { @@ -172,7 +172,7 @@ namespace MCGalaxy } public void UpdateModels() { - Player.players.ForEach( + PlayerInfo.players.ForEach( p => { if (p.level == this.level) diff --git a/Player/Player.Timers.cs b/Player/Player.Timers.cs index b694640c1..1e6bc9560 100644 --- a/Player/Player.Timers.cs +++ b/Player/Player.Timers.cs @@ -117,8 +117,8 @@ namespace MCGalaxy { } SendMessage("You have modified &a" + overallBlocks + Server.DefaultColor + " blocks!"); - string suffix = players.Count == 1 ? " player online" : " players online"; - SendMessage("There are currently &a" + players.Count + suffix); + string suffix = PlayerInfo.players.Count == 1 ? " player online" : " players online"; + SendMessage("There are currently &a" + PlayerInfo.players.Count + suffix); try { ZombieGame.alive.Remove(this); diff --git a/Player/Player.cs b/Player/Player.cs index 5d8302589..8b3bd1ace 100644 --- a/Player/Player.cs +++ b/Player/Player.cs @@ -30,10 +30,7 @@ using MCGalaxy.Util; namespace MCGalaxy { public sealed partial class Player : IDisposable { - /// - /// List of all server players. - /// - public static List players = new List(); + /// /// Key - Name /// Value - IP @@ -54,7 +51,7 @@ namespace MCGalaxy { public List mapgroups = new List(); public static List globalignores = new List(); public static int totalMySQLFailed = 0; - public static byte number { get { return (byte)players.Count; } } + public static byte number { get { return (byte)PlayerInfo.players.Count; } } static System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); static MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider(); public static string lastMSG = ""; @@ -325,21 +322,6 @@ namespace MCGalaxy { public bool isStaff; public bool verifiedName; - public struct OfflinePlayer { - public string name, color, title, titleColor; - public int money; - //need moar? add moar! just make sure you adjust Player.FindOffline() method - /// - /// Creates a new OfflinePlayer object. - /// - /// Name of the player. - /// Color of player name. - /// Title of player. - /// Title color of player - /// Player's money. - public OfflinePlayer(string nm, string clr, string tl, string tlclr, int mon) { name = nm; color = clr; title = tl; titleColor = tlclr; money = mon; } - } - public static string CheckPlayerStatus(Player p) { if ( p.hidden ) return "hidden"; @@ -639,12 +621,12 @@ namespace MCGalaxy { if (!VIP.Find(this)) { // Check to see how many guests we have - if (Player.players.Count >= Server.players && !IPInPrivateRange(ip)) { Kick("Server full!"); return; } + if (PlayerInfo.players.Count >= Server.players && !IPInPrivateRange(ip)) { Kick("Server full!"); return; } // Code for limiting no. of guests if (Group.findPlayerGroup(name) == Group.findPerm(LevelPermission.Guest)) { // Check to see how many guests we have - int currentNumOfGuests = Player.players.Count(pl => pl.group.Permission <= LevelPermission.Guest); + int currentNumOfGuests = PlayerInfo.players.Count(pl => pl.group.Permission <= LevelPermission.Guest); if (currentNumOfGuests >= Server.maxGuests) { if (Server.guestLimitNotify) Chat.GlobalMessageOps("Guest " + this.DisplayName + " couldn't log in - too many guests."); @@ -657,7 +639,7 @@ namespace MCGalaxy { if (version != Server.version) { Kick("Wrong version!"); return; } - foreach (Player p in players) { + foreach (Player p in PlayerInfo.players) { if (p.name == name) { if (Server.verify) { p.Kick("Someone logged in as you!"); break; @@ -753,7 +735,7 @@ namespace MCGalaxy { globalignores.Add(searchxml); foreach (string ignorer in globalignores) { - Player foundignore = Player.Find(ignorer); + Player foundignore = PlayerInfo.Find(ignorer); foundignore.ignoreglobal = true; } File.Delete("ranks/ignore/GlobalIgnore.xml"); @@ -770,8 +752,8 @@ namespace MCGalaxy { if (disconnected) return; loggedIn = true; - lock (players) - players.Add(this); + lock (PlayerInfo.players) + PlayerInfo.players.Add(this); connections.Remove(this); @@ -854,7 +836,7 @@ namespace MCGalaxy { { if ((Server.guestJoinNotify && group.Permission <= LevelPermission.Guest) || group.Permission > LevelPermission.Guest) { - Player.players.ForEach(p1 => Player.SendMessage(p1, joinm)); + PlayerInfo.players.ForEach(p1 => Player.SendMessage(p1, joinm)); } } if (group.Permission >= Server.adminchatperm && Server.adminsjoinsilent) { @@ -910,7 +892,7 @@ namespace MCGalaxy { pos = new ushort[3] { x, y, z }; rot = new byte[2] { level.rotx, level.roty }; GlobalSpawn(this, x, y, z, rot[0], rot[1], true); - foreach (Player p in players) { + foreach (Player p in PlayerInfo.players) { if (p.level == level && p != this && !p.hidden) SendSpawn(p.id, p.color + p.name, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1]); if (HasCpeExt(CpeExt.ChangeModel)) @@ -929,58 +911,16 @@ namespace MCGalaxy { } void InitPlayerStats(DataTable playerDb) { - prefix = ""; - time = "0 0 0 1"; - title = ""; - titlecolor = ""; - color = group.color; - money = 0; - firstLogin = DateTime.Now; - totalLogins = 1; - totalKicked = 0; - overallDeath = 0; - overallBlocks = 0; - timeLogged = DateTime.Now; SendMessage("Welcome " + DisplayName + "! This is your first visit."); - - Database.executeQuery(String.Format("INSERT INTO Players (Name, IP, FirstLogin, LastLogin, totalLogin, Title, totalDeaths, Money, totalBlocks, totalKicked, TimeSpent) VALUES " + - "('{0}', '{1}', '{2:yyyy-MM-dd HH:mm:ss}', '{3:yyyy-MM-dd HH:mm:ss}', {4}, '{5}', {6}, {7}, {8}, {9}, '{10}')", - name, ip, firstLogin, DateTime.Now, totalLogins, prefix, overallDeath, money, loginBlocks, totalKicked, time)); - string query = "INSERT INTO Economy (player, money, total, purchase, payment, salary, fine) VALUES ('" + name + "', " + money + ", 0, '%cNone', '%cNone', '%cNone', '%cNone')"; - Database.executeQuery(query); + PlayerInfo.CreateInfo(this); } void LoadPlayerStats(DataTable playerDb) { - DataRow row = playerDb.Rows[0]; - totalLogins = int.Parse(row["totalLogin"].ToString()) + 1; - time = row["TimeSpent"].ToString(); - userID = int.Parse(row["ID"].ToString()); - firstLogin = DateTime.Parse(row["firstLogin"].ToString()); - timeLogged = DateTime.Now; + PlayerInfo.LoadInfo(playerDb, this); + SendMessage("Welcome back " + color + prefix + DisplayName + "%S! " + + "You've been here " + totalLogins + " times!"); - if (row["Title"].ToString().Trim() != "") { - string parse = row["Title"].ToString().Trim().Replace("[", ""); - title = parse.Replace("]", ""); - } - - if (row["title_color"].ToString().Trim() != "") - titlecolor = Colors.Parse(row["title_color"].ToString().Trim()); - else - titlecolor = ""; - - if (row["color"].ToString().Trim() != "") - color = Colors.Parse(row["color"].ToString().Trim()); - else - color = group.color; - - overallDeath = int.Parse(row["TotalDeaths"].ToString()); - overallBlocks = long.Parse(row["totalBlocks"].ToString().Trim()); - //money = int.Parse(playerDb.Rows[0]["Money"].ToString()); - money = Economy.RetrieveEcoStats(this.name).money; - totalKicked = int.Parse(row["totalKicked"].ToString()); - SendMessage("Welcome back " + color + prefix + DisplayName + Server.DefaultColor + "! You've been here " + totalLogins + " times!"); - if (Server.muted.Contains(name)) - { + if (Server.muted.Contains(name)) { muted = true; GlobalMessage(DisplayName + " is still muted from the last time they went offline."); } @@ -2157,7 +2097,7 @@ return; } public static void GlobalBlockchange(Level level, ushort x, ushort y, ushort z, byte type, byte extType) { - players.ForEach(delegate(Player p) { if ( p.level == level ) { p.SendBlockchange(x, y, z, type, extType); } }); + PlayerInfo.players.ForEach(delegate(Player p) { if ( p.level == level ) { p.SendBlockchange(x, y, z, type, extType); } }); } // THIS IS NOT FOR SENDING GLOBAL MESSAGES!!! IT IS TO SEND A MESSAGE FROM A SPECIFIED PLAYER!!!!!!!!!!!!!! @@ -2205,7 +2145,7 @@ return; } message = referee + from.color + from.voicestring + from.color + from.prefix + from.DisplayName + ": %r&f" + message; } - players.ForEach(delegate(Player p) { + PlayerInfo.players.ForEach(delegate(Player p) { if ( p.level.worldChat && p.Chatroom == null ) { if ( p.ignoreglobal == false ) { if ( from != null ) { @@ -2275,7 +2215,7 @@ return; message = Colors.EscapeColors(message); else message = message.Replace("%G", Server.GlobalChatColor); - players.ForEach(delegate(Player p) { + PlayerInfo.players.ForEach(delegate(Player p) { if ( p.level.worldChat && p.Chatroom == null && ( !global || !p.muteGlobal ) ) { Player.SendMessage(p, message, !global); } @@ -2284,7 +2224,7 @@ return; public static void GlobalSpawn(Player from, ushort x, ushort y, ushort z, byte rotx, byte roty, bool self, string possession = "") { - players.ForEach(delegate(Player p) + PlayerInfo.players.ForEach(delegate(Player p) { if (p.Loading && p != from) { return; } if (p.level != from.level || (from.hidden && !self)) { return; } @@ -2313,7 +2253,7 @@ return; }); } public static void GlobalDespawn(Player from, bool self) { - players.ForEach(delegate(Player p) { + PlayerInfo.players.ForEach(delegate(Player p) { if ( p.level != from.level || ( from.hidden && !self ) ) { return; } if ( p != from ) { p.SendDespawn(from.id); } else if ( self ) { p.SendDespawn(255); } @@ -2322,7 +2262,7 @@ return; public bool MarkPossessed(string marker = "") { if ( marker != "" ) { - Player controller = Player.Find(marker); + Player controller = PlayerInfo.Find(marker); if ( controller == null ) { return false; } @@ -2334,7 +2274,7 @@ return; } public static void GlobalUpdate() { - players.ForEach( + PlayerInfo.players.ForEach( delegate(Player p) { if ( !p.hidden ) p.UpdatePosition(); @@ -2447,7 +2387,7 @@ return; CP437Reader.ReadAllText("text/logout/" + name + ".txt"); if ((Server.guestLeaveNotify && group.Permission <= LevelPermission.Guest) || group.Permission > LevelPermission.Guest) { - Player.players.ForEach(p1 => Player.SendMessage(p1, leavem)); + PlayerInfo.players.ForEach(p1 => Player.SendMessage(p1, leavem)); } } //IRCBot.Say(name + " left the game."); @@ -2463,7 +2403,7 @@ return; try { save(); } catch ( Exception e ) { Server.ErrorLog(e); } - players.Remove(this); + PlayerInfo.players.Remove(this); Server.s.PlayerListUpdate(); try { left.Add(this.name.ToLower(), this.ip); @@ -2475,7 +2415,7 @@ return; /*if (Server.AutoLoad && level.unload) { -foreach (Player pl in Player.players) +foreach (Player pl in PlayerInfo.players) if (pl.level == level) hasplayers = true; if (!level.name.Contains("Museum " + Server.DefaultColor) && hasplayers == false) { @@ -2535,74 +2475,24 @@ catch { }*/ } //fixed undo code public bool IsAloneOnCurrentLevel() { - return players.All(pl => pl.level != level || pl == this); + return PlayerInfo.players.All(pl => pl.level != level || pl == this); } - #endregion - #region == CHECKING == - public static List GetPlayers() { return new List(players); } - public static bool Exists(string name) { - foreach ( Player p in players ) { if ( p.name.ToLower() == name.ToLower() ) { return true; } } return false; - } - public static bool Exists(byte id) { - foreach ( Player p in players ) { if ( p.id == id ) { return true; } } return false; - } - - public static Player Find(string name) { - List tempList = new List(); - tempList.AddRange(players); - Player match = null; int matches = 0; - name = name.ToLower(); - - foreach (Player p in tempList) { - if (p.name.ToLower() == name) return p; - if (p.name.ToLower().Contains(name)) { - match = p; matches++; - } - } - return matches == 1 ? match : null; - } - - public static Player FindNick(string nick) { - List tempList = new List(); - tempList.AddRange(players); - Player match = null; int matches = 0; - nick = nick.ToLower(); - - foreach (Player p in tempList) { - if (p.DisplayName.ToLower() == nick) return p; - if (p.DisplayName.ToLower().Contains(nick)) { - match = p; matches++; - } - } - return matches == 1 ? match : null; - } - - public static Group GetGroup(string name) { - return Group.findPlayerGroup(name); - } - public static string GetColor(string name) { - return GetGroup(name).color; - } - public static OfflinePlayer FindOffline(string name) { - OfflinePlayer offPlayer = new OfflinePlayer("", "", "", "", 0); - Database.AddParams("@Name", name); - using (DataTable playerDB = Database.fillData("SELECT * FROM Players WHERE Name = @Name")) { - if (playerDB.Rows.Count == 0) - return offPlayer; - else { - offPlayer.name = playerDB.Rows[0]["Name"].ToString().Trim(); - offPlayer.title = playerDB.Rows[0]["Title"].ToString().Trim(); - offPlayer.titleColor = Colors.Parse(playerDB.Rows[0]["title_color"].ToString().Trim()); - offPlayer.color = Colors.Parse(playerDB.Rows[0]["color"].ToString().Trim()); - offPlayer.money = int.Parse(playerDB.Rows[0]["Money"].ToString()); - if (offPlayer.color == "") { offPlayer.color = GetGroup(offPlayer.name).color; } - } - } - return offPlayer; - } #endregion #region == OTHER == + + [Obsolete] + public static List players { get { return PlayerInfo.players; } } + + [Obsolete] + public static Player Find(string name) { return PlayerInfo.Find(name); } + + [Obsolete] + public static Player FindExact(string name) { return PlayerInfo.FindExact(name); } + + [Obsolete] + public static Player FindNick(string name) { return PlayerInfo.FindNick(name); } + static byte FreeId() { /* for (byte i = 0; i < 255; i++) @@ -2615,7 +2505,7 @@ Next: continue; } unchecked { return 0xFF; }*/ for ( byte i = 0; i < 255; i++ ) { - bool used = players.Any(p => p.id == i); + bool used = PlayerInfo.players.Any(p => p.id == i); if ( !used ) return i; diff --git a/Player/PlayerBot.cs b/Player/PlayerBot.cs index ac07cdacf..82eea70f8 100644 --- a/Player/PlayerBot.cs +++ b/Player/PlayerBot.cs @@ -76,7 +76,7 @@ namespace MCGalaxy { if (kill) { - foreach (Player p in Player.players) + foreach (Player p in PlayerInfo.players) { if ((ushort)(p.pos[0] / 32) == x) { @@ -94,7 +94,7 @@ namespace MCGalaxy { if (Waypoints.Count == 0) { if (hunt) - Player.players.ForEach(delegate(Player p) + PlayerInfo.players.ForEach(delegate(Player p) { if (p.level == level && !p.invincible) { @@ -364,7 +364,7 @@ namespace MCGalaxy { playerbots.Add(bot); bot.GlobalSpawn(); - foreach (Player p in Player.players) { + foreach (Player p in PlayerInfo.players) { if (p.level == bot.level) Player.SendMessage(p, bot.color + bot.name + "%S, the bot, has been added."); } @@ -396,14 +396,14 @@ namespace MCGalaxy { } public void GlobalSpawn() { - Player.players.ForEach(p => { + PlayerInfo.players.ForEach(p => { if (p.level == level) p.SendSpawn(id, color + name, pos[0], pos[1], pos[2], rot[0], rot[1]); }); } public void GlobalDespawn() { - Player.players.ForEach(p => { + PlayerInfo.players.ForEach(p => { if (p.level == level) p.SendDespawn(id); }); @@ -417,7 +417,7 @@ namespace MCGalaxy { if (packet == null) return; try { - foreach (Player p in Player.players) { + foreach (Player p in PlayerInfo.players) { if (p.level == level) p.SendRaw(packet); } diff --git a/Player/PlayerInfo.cs b/Player/PlayerInfo.cs new file mode 100644 index 000000000..d57614aaa --- /dev/null +++ b/Player/PlayerInfo.cs @@ -0,0 +1,155 @@ +/* +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 System.Collections.Generic; +using System.Data; +using MCGalaxy.SQL; + +namespace MCGalaxy { + + public static class PlayerInfo { + + /// List of all server players. + public static List players = new List(); + + public static List GetPlayers() { return new List(PlayerInfo.players); } + + public static Group GetGroup(string name) { + return Group.findPlayerGroup(name); + } + + public static string GetColor(string name) { + return GetGroup(name).color; + } + + public static Player Find(string name) { + List tempList = new List(); + tempList.AddRange(players); + Player match = null; int matches = 0; + name = name.ToLower(); + + foreach (Player p in tempList) { + if (p.name.ToLower() == name) return p; + if (p.name.ToLower().Contains(name)) { + match = p; matches++; + } + } + return matches == 1 ? match : null; + } + + public static Player FindExact(string name) { + List tempList = new List(); + tempList.AddRange(players); + name = name.ToLower(); + + foreach (Player p in tempList) { + if (p.name.ToLower() == name) return p; + } + return null; + } + + public static Player FindNick(string nick) { + List tempList = new List(); + tempList.AddRange(players); + Player match = null; int matches = 0; + nick = nick.ToLower(); + + foreach (Player p in tempList) { + if (p.DisplayName.ToLower() == nick) return p; + if (p.DisplayName.ToLower().Contains(nick)) { + match = p; matches++; + } + } + return matches == 1 ? match : null; + } + + internal static void CreateInfo(Player p) { + p.prefix = ""; + p.time = "0 0 0 1"; + p.title = ""; + p.titlecolor = ""; + p.color = p.group.color; + p.money = 0; + + p.firstLogin = DateTime.Now; + p.totalLogins = 1; + p.totalKicked = 0; + p.overallDeath = 0; + p.overallBlocks = 0; + p.timeLogged = DateTime.Now; + + const string query = "INSERT INTO Players (Name, IP, FirstLogin, LastLogin, totalLogin, Title, totalDeaths, Money, totalBlocks, totalKicked, TimeSpent) VALUES " + + "('{0}', '{1}', '{2:yyyy-MM-dd HH:mm:ss}', '{3:yyyy-MM-dd HH:mm:ss}', {4}, '{5}', {6}, {7}, {8}, {9}, '{10}')"; + Database.executeQuery(String.Format(query, p.name, p.ip, p.firstLogin, DateTime.Now, p.totalLogins, p.prefix, p.overallDeath, p.money, p.loginBlocks, p.totalKicked, p.time)); + string ecoQuery = "INSERT INTO Economy (player, money, total, purchase, payment, salary, fine) VALUES ('" + p.name + "', " + p.money + ", 0, '%cNone', '%cNone', '%cNone', '%cNone')"; + Database.executeQuery(ecoQuery); + } + + internal static void LoadInfo(DataTable playerDb, Player p) { + DataRow row = playerDb.Rows[0]; + p.totalLogins = int.Parse(row["totalLogin"].ToString()) + 1; + p.time = row["TimeSpent"].ToString(); + p.userID = int.Parse(row["ID"].ToString()); + p.firstLogin = DateTime.Parse(row["firstLogin"].ToString()); + p.timeLogged = DateTime.Now; + + p.title = row["Title"].ToString().Trim(); + if (p.title != "") + p.title = p.title.Replace("[", "").Replace("]", ""); + + p.titlecolor = row["title_color"].ToString().Trim(); + if (p.titlecolor != "") + p.titlecolor = Colors.Parse(p.titlecolor); + else + p.titlecolor = ""; + + p.color = row["color"].ToString().Trim(); + if (p.color != "") + p.color = Colors.Parse(p.color); + else + p.color = p.group.color; + + p.overallDeath = int.Parse(row["TotalDeaths"].ToString()); + p.overallBlocks = long.Parse(row["totalBlocks"].ToString().Trim()); + //money = int.Parse(playerDb.Rows[0]["Money"].ToString()); + p.money = Economy.RetrieveEcoStats(p.name).money; + p.totalKicked = int.Parse(row["totalKicked"].ToString()); + } + + public static OfflinePlayer FindOffline(string name) { + OfflinePlayer pl = new OfflinePlayer(); + Database.AddParams("@Name", name); + string syntax = Server.useMySQL ? "SELECT * FROM Players WHERE Name=@Name COLLATE utf8_general_ci" : + "SELECT * FROM Players WHERE Name=@Name COLLATE NOCASE"; + using (DataTable playerDB = Database.fillData(syntax)) { + if (playerDB.Rows.Count == 0) { + return null; + } else { + DataRow row = playerDB.Rows[0]; + pl.name = row["Name"].ToString().Trim(); + pl.title = row["Title"].ToString().Trim(); + pl.titleColor = Colors.Parse(row["title_color"].ToString().Trim()); + pl.color = Colors.Parse(row["color"].ToString().Trim()); + if (pl.color == "") pl.color = GetGroup(pl.name).color; + } + } + return pl; + } + } + + public class OfflinePlayer { + public string name, color, title, titleColor; + } +} diff --git a/Player/Waypoint.cs b/Player/Waypoint.cs index 16b53d1c0..2bdc5bb1b 100644 --- a/Player/Waypoint.cs +++ b/Player/Waypoint.cs @@ -137,7 +137,7 @@ namespace MCGalaxy { } public static void Save() { - foreach ( Player p in Player.players ) { + foreach ( Player p in PlayerInfo.players ) { if ( p.Waypoints.Count >= 1 ) { using ( StreamWriter SW = new StreamWriter("extra/Waypoints/" + p.name + ".save") ) { foreach ( Waypoint wp in p.Waypoints ) { diff --git a/Server/AutoSaver.cs b/Server/AutoSaver.cs index ae9f3a206..467f5c6e1 100644 --- a/Server/AutoSaver.cs +++ b/Server/AutoSaver.cs @@ -40,8 +40,8 @@ namespace MCGalaxy Thread.Sleep(_interval); Server.ml.Queue(delegate { Run(); }); - if (Player.players.Count <= 0) continue; - string allCount = Player.players.Aggregate("", (current, pl) => current + (", " + pl.name)); + if (PlayerInfo.players.Count <= 0) continue; + string allCount = PlayerInfo.players.Aggregate("", (current, pl) => current + (", " + pl.name)); try { Server.s.Log("!PLAYERS ONLINE: " + allCount.Remove(0, 2), true); } catch { } @@ -103,10 +103,10 @@ namespace MCGalaxy try { - if (Player.players.Count > 0) + if (PlayerInfo.players.Count > 0) { List tempList = new List(); - tempList.AddRange(Player.players); + tempList.AddRange(PlayerInfo.players); foreach (Player p in tempList) { p.save(); } tempList.Clear(); } diff --git a/Server/Colors.cs b/Server/Colors.cs index 717dd77e4..8d6a468b8 100644 --- a/Server/Colors.cs +++ b/Server/Colors.cs @@ -216,7 +216,7 @@ namespace MCGalaxy { static void SetExtCol(CustomColor col) { ExtColors[col.Code] = col; - foreach (Player p in Player.players) { + foreach (Player p in PlayerInfo.players) { if (!p.HasCpeExt(CpeExt.TextColors)) continue; SendSetTextColor(p, col); } diff --git a/Server/Extra/Checktimer.cs b/Server/Extra/Checktimer.cs index d321e48d0..ffb4af9df 100644 --- a/Server/Extra/Checktimer.cs +++ b/Server/Extra/Checktimer.cs @@ -1,4 +1,4 @@ -/* +/* Copyright 2011 MCGalaxy Dual-licensed under the Educational Community License, Version 2.0 and the GNU General Public License, Version 3 (the "Licenses"); you may @@ -47,7 +47,7 @@ namespace MCGalaxy } public static void TRExpiryCheck() { - foreach (Player p in Player.players) + foreach (Player p in PlayerInfo.players) { foreach (string line3 in File.ReadAllLines("text/tempranks.txt")) { @@ -60,7 +60,7 @@ namespace MCGalaxy int days = Convert.ToInt32(line3.Split(' ')[6]); int months = Convert.ToInt32(line3.Split(' ')[7]); int years = Convert.ToInt32(line3.Split(' ')[8]); - Player who = Player.Find(player); + Player who = PlayerInfo.Find(player); DateTime ExpireDate = new DateTime(years, months, days, hours, minutes, 0); DateTime tocheck = ExpireDate.AddHours(Convert.ToDouble(period)); DateTime tochecknow = DateTime.Now; diff --git a/Server/Extra/OmniBan.cs b/Server/Extra/OmniBan.cs index cef96fc45..6aa21efcc 100644 --- a/Server/Extra/OmniBan.cs +++ b/Server/Extra/OmniBan.cs @@ -84,7 +84,7 @@ namespace MCGalaxy try { kickall: - foreach (Player p in Player.players) + foreach (Player p in PlayerInfo.players) if (CheckPlayer(p)) { p.Kick(kickMsg); diff --git a/Server/Server.cs b/Server/Server.cs index 0f7d73cca..0d79d1349 100644 --- a/Server/Server.cs +++ b/Server/Server.cs @@ -842,11 +842,11 @@ namespace MCGalaxy while (true) { Thread.Sleep(3); - for (i = 0; i < Player.players.Count; i++) + for (i = 0; i < PlayerInfo.players.Count; i++) { try { - p = Player.players[i]; + p = PlayerInfo.players[i]; if (p.frozen) { @@ -854,7 +854,7 @@ namespace MCGalaxy } else if (p.following != "") { - who = Player.Find(p.following); + who = PlayerInfo.Find(p.following); if (who == null || who.level != p.level) { p.following = ""; @@ -879,7 +879,7 @@ namespace MCGalaxy } else if (p.possess != "") { - who = Player.Find(p.possess); + who = PlayerInfo.Find(p.possess); if (who == null || who.level != p.level) p.possess = ""; } @@ -926,7 +926,7 @@ namespace MCGalaxy string api = ""; API API = new API(); API.max_players = (int)Server.players; - API.players = Player.players.Select(mc => mc.name).ToArray(); + API.players = PlayerInfo.players.Select(mc => mc.name).ToArray(); API.chat = Player.Last50Chat.ToArray(); api = JsonConvert.SerializeObject(API, Formatting.Indented); return api; @@ -1032,17 +1032,17 @@ namespace MCGalaxy public static void Exit(bool AutoRestart) { List players = new List(); - foreach (Player p in Player.players) { p.save(); players.Add(p.name); } + foreach (Player p in PlayerInfo.players) { p.save(); players.Add(p.name); } foreach (string p in players) { if (!AutoRestart) - Player.Find(p).Kick(Server.customShutdown ? Server.customShutdownMessage : "Server shutdown. Rejoin in 10 seconds."); + PlayerInfo.Find(p).Kick(Server.customShutdown ? Server.customShutdownMessage : "Server shutdown. Rejoin in 10 seconds."); else - Player.Find(p).Kick("Server restarted! Rejoin!"); + PlayerInfo.Find(p).Kick("Server restarted! Rejoin!"); } APIServer.Stop(); InfoServer.Stop(); - //Player.players.ForEach(delegate(Player p) { p.Kick("Server shutdown. Rejoin in 10 seconds."); }); + //PlayerInfo.players.ForEach(delegate(Player p) { p.Kick("Server shutdown. Rejoin in 10 seconds."); }); Player.connections.ForEach( delegate(Player p) { @@ -1076,7 +1076,7 @@ namespace MCGalaxy public void PlayerListUpdate() { - if (Server.s.OnPlayerListChange != null) Server.s.OnPlayerListChange(Player.players); + if (Server.s.OnPlayerListChange != null) Server.s.OnPlayerListChange(PlayerInfo.players); } public void FailBeat()