diff --git a/MCGalaxy/Commands/CPE/CmdTexture.cs b/MCGalaxy/Commands/CPE/CmdTexture.cs index 1031a8e56..0f1dacde9 100644 --- a/MCGalaxy/Commands/CPE/CmdTexture.cs +++ b/MCGalaxy/Commands/CPE/CmdTexture.cs @@ -59,9 +59,10 @@ namespace MCGalaxy.Commands.CPE { } if (scope == "global" || scope == "globalzip") { + ServerConfig.DefaultTerrain = ""; + ServerConfig.DefaultTexture = ""; + if (url.Length == 0) { - ServerConfig.DefaultTerrain = ""; - ServerConfig.DefaultTexture = ""; Player.Message(p, "Reset server textures to default"); } else if (url.CaselessEnds(".png")) { ServerConfig.DefaultTerrain = url; @@ -72,11 +73,11 @@ namespace MCGalaxy.Commands.CPE { } UpdateGlobal(p); } else if (scope == "level" || scope == "levelzip") { - if (!LevelInfo.ValidateAction(p, p.level, "set texture of this level")) return; + if (!LevelInfo.ValidateAction(p, p.level, "set texture of this level")) return; + p.level.Config.Terrain = ""; + p.level.Config.TexturePack = ""; - if (url.Length == 0) { - p.level.Config.Terrain = ""; - p.level.Config.TexturePack = ""; + if (url.Length == 0) { Player.Message(p, "Reset level textures to server default"); } else if (url.CaselessEnds(".png")) { p.level.Config.Terrain = url; diff --git a/MCGalaxy/Games/TntWars/TWGame.Plugin.cs b/MCGalaxy/Games/TntWars/TWGame.Plugin.cs index 78fcdb888..9203c2ec3 100644 --- a/MCGalaxy/Games/TntWars/TWGame.Plugin.cs +++ b/MCGalaxy/Games/TntWars/TWGame.Plugin.cs @@ -239,10 +239,10 @@ namespace MCGalaxy.Games { suffix = " %S(with help from " + assistant.ColoredName + ")"; if (TeamKill(assistant, pl)) { - Player.Message(assistant, "TNT Wars: - " + cfg.AssistScore + " point(s) for team kill assist!"); + Player.Message(assistant, "TNT Wars: - " + cfg.AssistScore + " points for team kill assist!"); ChangeScore(assistant, -cfg.AssistScore); } else { - Player.Message(assistant, "TNT Wars: + " + cfg.AssistScore + " point(s) for assist!"); + Player.Message(assistant, "TNT Wars: + " + cfg.AssistScore + " points for assist!"); ChangeScore(assistant, cfg.AssistScore); } }