AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 20:16:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changing zip url should reset png url, and vice versa

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MCGalaxy/Commands/CPE/CmdTexture.cs
View File

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

4
MCGalaxy/Games/TntWars/TWGame.Plugin.cs
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);
}
}