diff --git a/Commands/Chat/CmdChatRoom.cs b/Commands/Chat/CmdChatRoom.cs index 4039b07cb..9b6e1fcae 100644 --- a/Commands/Chat/CmdChatRoom.cs +++ b/Commands/Chat/CmdChatRoom.cs @@ -116,7 +116,7 @@ namespace MCGalaxy.Commands { Player.Message(p, "The chatoom '{0}' already exists", room); } else { Server.Chatrooms.Add(room); - Player.GlobalMessage("A new chat room '{0}' has been created", room); + Player.GlobalMessage("A new chat room '" + room + "' has been created"); } } diff --git a/Commands/Information/WhoInfo.cs b/Commands/Information/WhoInfo.cs index ffd083979..b5efb5ac0 100644 --- a/Commands/Information/WhoInfo.cs +++ b/Commands/Information/WhoInfo.cs @@ -61,7 +61,7 @@ namespace MCGalaxy.Commands { + "%S, and is currently &aonline"); Player.Message(p, " Logged in &a{0} %Stimes, &c{1} %Sof which ended in a kick", who.Logins, who.Kicks); - if (who.Rank == LevelPermission.Banned) { + if (who.Group.Permission == LevelPermission.Banned) { string[] data = Ban.GetBanData(who.Name); if (data != null) Player.Message(p, " is banned for " + data[1] + " by " + data[0]); diff --git a/Player/Player.cs b/Player/Player.cs index 786bb525a..c36801e76 100644 --- a/Player/Player.cs +++ b/Player/Player.cs @@ -486,24 +486,24 @@ Next: continue; } public void TntAtATime() { - new Thread(() => { - CurrentAmountOfTnt += 1; - switch ( TntWarsGame.GetTntWarsGame(this).GameDifficulty ) { - case TntWarsGame.TntWarsDifficulty.Easy: - Thread.Sleep(3250); - break; + CurrentAmountOfTnt++; + int delay = 0; - case TntWarsGame.TntWarsDifficulty.Normal: - Thread.Sleep(2250); - break; - - case TntWarsGame.TntWarsDifficulty.Hard: - case TntWarsGame.TntWarsDifficulty.Extreme: - Thread.Sleep(1250); - break; - } - CurrentAmountOfTnt -= 1; - }).Start(); + switch (TntWarsGame.GetTntWarsGame(this).GameDifficulty) { + case TntWarsGame.TntWarsDifficulty.Easy: + delay = 3250; break; + case TntWarsGame.TntWarsDifficulty.Normal: + delay = 2250; break; + case TntWarsGame.TntWarsDifficulty.Hard: + case TntWarsGame.TntWarsDifficulty.Extreme: + delay = 1250; break; + } + Server.MainScheduler.QueueOnce(AllowMoreTntTask, null, + TimeSpan.FromMilliseconds(delay)); + } + + void AllowMoreTntTask(SchedulerTask task) { + CurrentAmountOfTnt--; } public static bool BlacklistCheck(string name, string foundLevel) {