Changing zip url should reset png url, and vice versa

This commit is contained in:
UnknownShadow200 2018-07-06 23:54:12 +10:00
parent 9d8379733e
commit 43e185bab9
2 changed files with 9 additions and 8 deletions

View File

@ -59,9 +59,10 @@ namespace MCGalaxy.Commands.CPE {
}
if (scope == "global" || scope == "globalzip") {
if (url.Length == 0) {
ServerConfig.DefaultTerrain = "";
ServerConfig.DefaultTexture = "";
if (url.Length == 0) {
Player.Message(p, "Reset server textures to default");
} else if (url.CaselessEnds(".png")) {
ServerConfig.DefaultTerrain = url;
@ -73,10 +74,10 @@ 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 (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;

View File

@ -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);
}
}