From f81577d36d39d6c4230cee0d1f985c3283b1bcb1 Mon Sep 17 00:00:00 2001
From: Juris <jurchiks101@gmail.com>
Date: Sun, 28 Dec 2014 16:23:53 +0200
Subject: [PATCH] Getting rid of the redundant Config.CNAME_TEMPLATE check in
AdminEditChar. If the character name is invalid, it simply won't find any
matches. Besides that, if the admin changes the CNAME_TEMPLATE property over
time, this check *could* make the old characters, created before the changes,
unsearchable, which is certainly not desired.
---
.../admincommandhandlers/AdminEditChar.java | 40 +++++++------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index b26369cfc3..783cfbf548 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1239,34 +1239,22 @@ public class AdminEditChar implements IAdminCommandHandler
*/
private void findCharactersPerAccount(L2PcInstance activeChar, String characterName) throws IllegalArgumentException
{
- if (characterName.matches(Config.CNAME_TEMPLATE))
- {
- String account = null;
- Map<Integer, String> chars;
- L2PcInstance player = L2World.getInstance().getPlayer(characterName);
- if (player == null)
- {
- throw new IllegalArgumentException("Player doesn't exist");
- }
- chars = player.getAccountChars();
- account = player.getAccountName();
- final StringBuilder replyMSG = new StringBuilder(chars.size() * 20);
- final NpcHtmlMessage adminReply = new NpcHtmlMessage();
- adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/accountinfo.htm");
- for (String charname : chars.values())
- {
- StringUtil.append(replyMSG, charname, "<br1>");
- }
-
- adminReply.replace("%characters%", replyMSG.toString());
- adminReply.replace("%account%", account);
- adminReply.replace("%player%", characterName);
- activeChar.sendPacket(adminReply);
- }
- else
+ L2PcInstance player = L2World.getInstance().getPlayer(characterName);
+ if (player == null)
{
- throw new IllegalArgumentException("Malformed character name");
+ throw new IllegalArgumentException("Player doesn't exist");
}
+
+ final Map<Integer, String> chars = player.getAccountChars();
+ final StringBuilder replyMSG = new StringBuilder(chars.size() * 20);
+ chars.values().stream().forEachOrdered(name -> StringUtil.append(replyMSG, name, "<br1>"));
+
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
+ adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/accountinfo.htm");
+ adminReply.replace("%account%", player.getAccountName());
+ adminReply.replace("%player%", characterName);
+ adminReply.replace("%characters%", replyMSG.toString());
+ activeChar.sendPacket(adminReply);
}
/**
--
GitLab