AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix colour bleeding in /who when on a museum map (Thanks fam0r)

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-14 00:27:54 +10:00
parent 551459a451
commit 8aa3a1e7da
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MCGalaxy/Commands/Information/CmdPlayers.cs
View File

@ -110,7 +110,8 @@ namespace MCGalaxy.Commands.Info {
} }
builder.Append(name); builder.Append(name);
builder.Append(" (").Append(pl.level.name).Append("),"); string lvlName = Colors.StripColors(pl.level.name); // for museums
builder.Append(" (").Append(lvlName).Append("),");
} }
} }

4
MCGalaxy/Commands/World/CmdNewLvl.cs
View File

@ -16,7 +16,6 @@
permissions and limitations under the Licenses. permissions and limitations under the Licenses.
*/ */
using System; using System;
using System.IO;
using System.Threading; using System.Threading;
using MCGalaxy.Generator; using MCGalaxy.Generator;
@ -43,7 +42,8 @@ namespace MCGalaxy.Commands.World {
string name = args[0].ToLower(); string name = args[0].ToLower();
if (!CheckMapAxis(p, args[1], "Width", ref x)) return false; if (!CheckMapAxis(p, args[1], "Width", ref x)) return false;
if (!CheckMapAxis(p, args[2], "Height", ref y)) return false; if (!CheckMapAxis(p, args[2], "Height", ref y)) return false;
if (!CheckMapAxis(p, args[3], "Length", ref z)) return false; if (!CheckMapAxis(p, args[3], "Length", ref z)) return false;
if (!CheckMapVolume(p, x, y, z)) return true;
string seed = args.Length == 6 ? args[5] : ""; string seed = args.Length == 6 ? args[5] : "";
if (!Formatter.ValidName(p, name, "level")) return false; if (!Formatter.ValidName(p, name, "level")) return false;

8
MCGalaxy/Levels/Level.Fields.cs
View File

@ -33,19 +33,21 @@ namespace MCGalaxy {
[ConfigString("MOTD", "General", null, "ignore", true, null, 128)] [ConfigString("MOTD", "General", null, "ignore", true, null, 128)]
public string motd = "ignore"; public string motd = "ignore";
public string ColoredName { public string Color {
get { get {
LevelPermission maxPerm = permissionvisit; LevelPermission maxPerm = permissionvisit;
if (maxPerm < permissionbuild) maxPerm = permissionbuild; if (maxPerm < permissionbuild) maxPerm = permissionbuild;
return Group.GetColor(maxPerm) + name; return Group.GetColor(maxPerm);
} }
} }
public string ColoredName { get { return Color + name; } }
public byte rotx, roty; public byte rotx, roty;
public ushort spawnx, spawny, spawnz; public ushort spawnx, spawny, spawnz;
public Position SpawnPos { get { return new Position(16 + spawnx * 32, 32 + spawny * 32, 16 + spawnz * 32); } } public Position SpawnPos { get { return new Position(16 + spawnx * 32, 32 + spawny * 32, 16 + spawnz * 32); } }
public Orientation SpawnRot { get { return new Orientation(rotx, roty); } } public Orientation SpawnRot { get { return new Orientation(rotx, roty); } }
public BlockDefinition[] CustomBlockDefs; public BlockDefinition[] CustomBlockDefs;
public BlockProps[] CustomBlockProps; public BlockProps[] CustomBlockProps;
public ExtrasCollection Extras = new ExtrasCollection(); public ExtrasCollection Extras = new ExtrasCollection();