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

Show 'X is server owner' in /whois, allow manually turning off info/dev prefix titles by modifying server.properties

Browse Source
This commit is contained in:
UnknownShadow200 2017-04-16 08:46:45 +10:00
parent bfa1cc72b9
commit fe68b4e695
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCGalaxy/Commands/Information/WhoInfo.cs
View File

@ -79,6 +79,8 @@ namespace MCGalaxy.Commands {
Player.Message(p, " Player is an &9{0} Developer", Server.SoftwareName); Player.Message(p, " Player is an &9{0} Developer", Server.SoftwareName);
if (Server.Mods.CaselessContains(who.Name.TrimEnd('+'))) if (Server.Mods.CaselessContains(who.Name.TrimEnd('+')))
Player.Message(p, " Player is an &9{0} Moderator", Server.SoftwareName); Player.Message(p, " Player is an &9{0} Moderator", Server.SoftwareName);
if (Server.server_owner.CaselessEq(who.Name))
Player.Message(p, " Player is the &cServer owner");
if (canSeeIP) { if (canSeeIP) {
string ipMsg = who.IP; string ipMsg = who.IP;

3
MCGalaxy/Player/Group/Group.cs
View File

@ -177,9 +177,10 @@ namespace MCGalaxy {
// rank doesn't exist to begin with // rank doesn't exist to begin with
if (fileName == null || !File.Exists("ranks/" + fileName)) { if (fileName == null || !File.Exists("ranks/" + fileName)) {
fileName = desired + ".txt"; fileName = desired + ".txt";
// TODO: should start backwards from z to a
} else if (MoveToFile(desired + ".txt")) { } else if (MoveToFile(desired + ".txt")) {
} else { } else {
// try appending a and z if duplicate // try appending a and z if duplicate file
for (char c = 'a'; c <= 'z'; c++) { for (char c = 'a'; c <= 'z'; c++) {
string newFile = desired + c + ".txt"; string newFile = desired + c + ".txt";
if (MoveToFile(newFile)) return; if (MoveToFile(newFile)) return;

6
MCGalaxy/Player/Player.cs
View File

@ -86,9 +86,11 @@ namespace MCGalaxy {
if (game != null) game.AdjustPrefix(this, ref prefix); if (game != null) game.AdjustPrefix(this, ref prefix);
bool isOwner = Server.server_owner.CaselessEq(name); bool isOwner = Server.server_owner.CaselessEq(name);
bool devPrefix = Server.SoftwareStaffPrefixes;
string viptitle = string viptitle =
isMod ? string.Format("{0}[&aInfo{0}] ", color) : (devPrefix && isMod) ? string.Format("{0}[&aInfo{0}] ", color) :
isDev ? string.Format("{0}[&9Dev{0}] ", color) : (devPrefix && isDev) ? string.Format("{0}[&9Dev{0}] ", color) :
isOwner ? string.Format("{0}[&cOwner{0}] ", color) : ""; isOwner ? string.Format("{0}[&cOwner{0}] ", color) : "";
prefix = prefix + viptitle; prefix = prefix + viptitle;
prefix = (title == "") ? prefix : prefix + color + "[" + titlecolor + title + color + "] "; prefix = (title == "") ? prefix : prefix + color + "[" + titlecolor + title + color + "] ";

2
MCGalaxy/Server/Server.Fields.cs
View File

@ -172,6 +172,8 @@ namespace MCGalaxy {
[ConfigPerm("os-perbuild-default", "Other", null, LevelPermission.Nobody)] [ConfigPerm("os-perbuild-default", "Other", null, LevelPermission.Nobody)]
public static LevelPermission osPerbuildDefault = LevelPermission.Nobody; public static LevelPermission osPerbuildDefault = LevelPermission.Nobody;
[ConfigBool("software-staff-prefixes", "Other", null, true)]
public static bool SoftwareStaffPrefixes = true;
[ConfigBool("tablist-rank-sorted", "Tablist", null, true)] [ConfigBool("tablist-rank-sorted", "Tablist", null, true)]
public static bool TablistRankSorted = true; public static bool TablistRankSorted = true;
[ConfigBool("tablist-global", "Tablist", null, false)] [ConfigBool("tablist-global", "Tablist", null, false)]