Skip to content

Implemented changeable nickname max length in spigot #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OllieMartin merged 1 commit into from
Apr 5, 2019
Merged

Implemented changeable nickname max length in spigot #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/MultiChatSpigot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public static boolean hookedPAPI() {
public static boolean showNicknamePrefix = false;
public static String nicknamePrefix = "~";
public static List<String> nicknameBlacklist = new ArrayList<String>();
public static int nicknameMaxLength = 20;
public static boolean nicknameLengthIncludeFormatting = false;

@SuppressWarnings("unchecked")
public void onEnable() {
Expand Down Expand Up @@ -125,6 +127,12 @@ public void onEnable() {
showNicknamePrefix = config.getBoolean("show_nickname_prefix");
nicknamePrefix = config.getString("nickname_prefix");
nicknameBlacklist = config.getStringList("nickname_blacklist");
if (config.contains("nickname_length_limit")) {

nicknameMaxLength = config.getInt("nickname_length_limit");
nicknameLengthIncludeFormatting = config.getBoolean("nickname_length_limit_formatting");

}
}

File f = new File(configDir, nameDataFile);
Expand Down
40 changes: 34 additions & 6 deletions multichat/src/main/java/xyz/olivermartin/multichat/spigotbridge/commands/CommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ public boolean onCommand(CommandSender commandSender, Command cmd, String label,
MultiChatSpigot.showNicknamePrefix = config.getBoolean("show_nickname_prefix");
MultiChatSpigot.nicknamePrefix = config.getString("nickname_prefix");
MultiChatSpigot.nicknameBlacklist = config.getStringList("nickname_blacklist");
if (config.contains("nickname_length_limit")) {

MultiChatSpigot.nicknameMaxLength = config.getInt("nickname_length_limit");
MultiChatSpigot.nicknameLengthIncludeFormatting = config.getBoolean("nickname_length_limit_formatting");

}
}

commandSender.sendMessage(ChatColor.GREEN + "The plugin has been reloaded!");
Expand Down Expand Up @@ -137,11 +143,22 @@ public boolean onCommand(CommandSender commandSender, Command cmd, String label,
return true;
}

if (NameManager.getInstance().stripAllFormattingCodes(args[0]).length() > 20 && !sender.hasPermission("multichatspigot.nick.anylength")) {
if (MultiChatSpigot.nicknameLengthIncludeFormatting) {
// Include formatting codes in the nickname length
if (args[0].length() > MultiChatSpigot.nicknameMaxLength && !sender.hasPermission("multichatspigot.nick.anylength")) {

sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max 20 characters! (Excluding format codes)");
return true;
sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max " + MultiChatSpigot.nicknameMaxLength + " characters! (Including format codes)");
return true;

}
} else {
// Do not include formatting codes in the nickname length
if (NameManager.getInstance().stripAllFormattingCodes(args[0]).length() > MultiChatSpigot.nicknameMaxLength && !sender.hasPermission("multichatspigot.nick.anylength")) {

sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max " + MultiChatSpigot.nicknameMaxLength + " characters! (Excluding format codes)");
return true;

}
}

String targetNickname = NameManager.getInstance().stripAllFormattingCodes(NameManager.getInstance().getCurrentName(targetUUID));
Expand Down Expand Up @@ -221,11 +238,22 @@ public boolean onCommand(CommandSender commandSender, Command cmd, String label,
return true;
}

if (NameManager.getInstance().stripAllFormattingCodes(args[1]).length() > 20 && !sender.hasPermission("multichatspigot.nick.anylength")) {
if (MultiChatSpigot.nicknameLengthIncludeFormatting) {
// Include formatting codes in the nickname length
if (args[1].length() > MultiChatSpigot.nicknameMaxLength && !sender.hasPermission("multichatspigot.nick.anylength")) {

sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max 20 characters! (Excluding format codes)");
return true;
sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max " + MultiChatSpigot.nicknameMaxLength + " characters! (Including format codes)");
return true;

}
} else {
// Do not include formatting codes in the nickname length
if (NameManager.getInstance().stripAllFormattingCodes(args[1]).length() > MultiChatSpigot.nicknameMaxLength && !sender.hasPermission("multichatspigot.nick.anylength")) {

sender.sendMessage(ChatColor.DARK_RED + "Sorry your nickname is too long, max " + MultiChatSpigot.nicknameMaxLength + " characters! (Excluding format codes)");
return true;

}
}

String targetNickname = NameManager.getInstance().stripAllFormattingCodes(NameManager.getInstance().getCurrentName(targetUUID));
Expand Down
6 changes: 6 additions & 0 deletions multichat/src/main/resources/spigotconfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,9 @@ show_nickname_prefix: false

# What should the prefix before nicknames be?
nickname_prefix: "~"

# The maximum length for nicknames
nickname_length_limit: 20

# Should formatting codes such as "&3" be counted in the length of the nickname?
nickname_length_limit_formatting: false