Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix duplicate nickname check with custom display names (#3922) 

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
luisc99 2021-01-28 16:08:38 +01:00 committed by GitHub
parent 79406613c1
commit f1ef21eb0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Essentials/src/main/java/com/earth2me/essentials/commands/Commandnick.java
View File

@ -6,7 +6,6 @@ import com.earth2me.essentials.utils.FormatUtil;
import net.ess3.api.events.NickChangeEvent;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.List;
@ -100,16 +99,18 @@ public class Commandnick extends EssentialsLoopCommand {
private boolean nickInUse(final User target, final String nick) {
final String lowerNick = FormatUtil.stripFormat(nick.toLowerCase(Locale.ENGLISH));
for (final Player onlinePlayer : ess.getOnlinePlayers()) {
for (final User onlinePlayer : ess.getOnlineUsers()) {
if (target.getBase().getName().equals(onlinePlayer.getName())) {
continue;
}
final String matchNick = FormatUtil.stripFormat(onlinePlayer.getDisplayName().replace(ess.getSettings().getNicknamePrefix(), ""));
if (lowerNick.equals(matchNick.toLowerCase(Locale.ENGLISH)) || lowerNick.equals(onlinePlayer.getName().toLowerCase(Locale.ENGLISH))) {
final String matchNick = FormatUtil.stripFormat(onlinePlayer.getNickname());
if ((matchNick != null && !matchNick.isEmpty() && lowerNick.equals(matchNick.toLowerCase(Locale.ENGLISH))) || lowerNick.equals(onlinePlayer.getName().toLowerCase(Locale.ENGLISH))) {
return true;
}
}
return ess.getUser(lowerNick) != null && ess.getUser(lowerNick) != target;
final User fetchedUser = ess.getUser(lowerNick);
return fetchedUser != null && fetchedUser != target;
}
private void setNickname(final Server server, final CommandSource sender, final User target, final String nickname) {