diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
index 177781caf06cb77959ceb531211d0a97e6f29f2a..efd3f5dd9bb88910ba714eef6faef919c18bacca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
@@ -213,7 +213,7 @@ public class TerritoryManagers extends AbstractNpcAI
badgeId = TerritoryWarManager.getInstance().TERRITORY_ITEM_IDS.get(territoryId);
}
int[] reward = TerritoryWarManager.getInstance().calcReward(player);
- NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0))
{
html.setFile(player.getHtmlPrefix(), "data/scripts/ai/npc/TerritoryManagers/reward-0a.html");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index ace7f1f44a5e400c1705aa897992b3bb64f8d6ff..029031c07b8be32232b3649f56e1b887e616ee99 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -105,7 +105,8 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
String html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
if (html != null)
{
- _messengerMsg = new NpcHtmlMessage(5);
+ // FIXME: We don't have an object id to put in here :(
+ _messengerMsg = new NpcHtmlMessage();
_messengerMsg.setHtml(html);
_messengerMsg.replace("%nextSiege%", Util.formatDate(_hall.getSiegeDate().getTime(), "yyyy-MM-dd HH:mm:ss"));
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index e705951a82c9ff28fea4d2402e5879b830e19851..947c146a0a0e5ae74b1b5b448246157515c66710 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -778,7 +778,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
private void sendRegistrationPageDate(L2PcInstance player)
{
- NpcHtmlMessage msg = new NpcHtmlMessage(5);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(null, "data/scripts/conquerablehalls/flagwar/" + qn + "/siege_date.htm");
msg.replace("%nextSiege%", _hall.getSiegeDate().getTime().toString());
player.sendPacket(msg);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
index 9e9e504ea72c601d55b262ac1e4da549046051ad..ddd662d9e617d5dcd76e6c672a6de8bba7b96b2e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
@@ -37,7 +37,7 @@ public class L2DoorInstanceActionShift implements IActionHandler
L2DoorInstance door = (L2DoorInstance) target;
activeChar.sendPacket(new StaticObject(door, activeChar.isGM()));
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");
html.replace("%class%", target.getClass().getSimpleName());
html.replace("%hp%", String.valueOf((int) door.getCurrentHp()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
index 20f1c9d749cf27b48d516578553229872110cbe1..e501541cef6b1fdcb299d0b3cf814f735f7346ff 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ItemInstanceActionShift.java
@@ -33,9 +33,7 @@ public class L2ItemInstanceActionShift implements IActionHandler
{
if (activeChar.getAccessLevel().isGm())
{
- NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
- final String html1 = StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>");
- html.setHtml(html1);
+ final NpcHtmlMessage html = new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
activeChar.sendPacket(html);
}
return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
index 46e2fd5a867eab0ee6ba9bac789d1581138386a1..4480ace86c610f4f74ee67ed606b3e0de4b51f8b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
@@ -63,7 +63,7 @@ public class L2NpcActionShift implements IActionHandler
// Set the target of the L2PcInstance activeChar
activeChar.setTarget(target);
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npcinfo.htm");
html.replace("%objid%", String.valueOf(target.getObjectId()));
@@ -171,7 +171,7 @@ public class L2NpcActionShift implements IActionHandler
// Set the target of the L2PcInstance activeChar
activeChar.setTarget(target);
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
int hpMul = Math.round((float) (((L2Character) target).getStat().calcStat(Stats.MAX_HP, 1, (L2Character) target, null) / BaseStats.CON.calcBonus((L2Character) target)));
if (hpMul == 0)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
index 4dd12d877ebff833aaff245e756740c80df4ded2..0d57ed66a0d54738d721de7399df3a4590a18a2d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
@@ -37,8 +37,7 @@ public class L2StaticObjectInstanceActionShift implements IActionHandler
activeChar.setTarget(target);
activeChar.sendPacket(new StaticObject((L2StaticObjectInstance) target));
- NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
- html.setHtml(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
+ final NpcHtmlMessage html = new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
activeChar.sendPacket(html);
}
return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index f33e4dac87fa9b69dc2fab7056bd324b4578023d..2e8fb812a64b43c7dfff1d6116869e7e2d6332aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -317,7 +317,7 @@ public class AdminAdmin implements IAdminCommandHandler
public void showConfigPage(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
TextBuilder replyMSG = new TextBuilder("<html><title>L2J :: Config</title><body>");
replyMSG.append("<center><table width=270><tr><td width=60><button value=\"Main\" action=\"bypass -h admin_admin\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=150>Config Server Panel</td><td width=60><button value=\"Back\" action=\"bypass -h admin_admin4\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table></center><br>");
replyMSG.append("<center><table width=260><tr><td width=140></td><td width=40></td><td width=40></td></tr>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
index 68934145d3bcb1b7c16cdeb93d73324ee8182ad6..4248468336d2aec8d5a39100cb3fe80fb5992690 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
@@ -297,7 +297,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
private void listAutoAnnouncements(L2PcInstance activeChar)
{
String content = HtmCache.getInstance().getHtmForce(activeChar.getHtmlPrefix(), "data/html/admin/autoannounce.htm");
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml(content);
final StringBuilder replyMSG = StringUtil.startAppend(500, "<br>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 839c685cd00e44a93acf8a2c72118c9418971d1f..538052490bc94bc8c9fb093e381b70a5f075d8c0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -298,7 +298,7 @@ public class AdminBuffs implements IAdminCommandHandler
StringUtil.append(html, "<br><center><button value=\"Remove All\" action=\"bypass -h admin_stopallbuffs ", Integer.toString(target.getObjectId()), "\" width=80 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></html>");
- NpcHtmlMessage ms = new NpcHtmlMessage(1);
+ final NpcHtmlMessage ms = new NpcHtmlMessage();
ms.setHtml(html.toString());
activeChar.sendPacket(ms);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
index 7815a8f98fcd265ee830e86d2573af6eb6f220fc..9585d5840fbf10530fb92cfd7eddc70c4558ce06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
@@ -357,7 +357,7 @@ public final class AdminCHSiege implements IAdminCommandHandler
private void sendSiegableHallPage(L2PcInstance activeChar, String hallId, SiegableHall hall)
{
- NpcHtmlMessage msg = new NpcHtmlMessage(5);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(null, "data/html/admin/siegablehall.htm");
msg.replace("%clanhallId%", hallId);
msg.replace("%clanhallName%", hall.getName());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
index f1b20de54b8c7853c0c048e80567e7586a93a79a..3179104d92da08533d21dc9f06b0a781c5b1028a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminClan.java
@@ -70,7 +70,7 @@ public class AdminClan implements IAdminCommandHandler
return false;
}
- final NpcHtmlMessage html = new NpcHtmlMessage(0, 5);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/claninfo.htm"));
html.replace("%clan_name%", clan.getName());
html.replace("%clan_leader%", clan.getLeaderName());
@@ -117,7 +117,7 @@ public class AdminClan implements IAdminCommandHandler
}
case "admin_clan_show_pending":
{
- final NpcHtmlMessage html = new NpcHtmlMessage(0, 5);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setHtml(HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/clanchanges.htm"));
StringBuilder sb = new StringBuilder();
for (L2Clan clan : ClanTable.getInstance().getClans())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
index 4fa1a5c472cbf2a44e8eb2946752f17d004f4beb..73b580f7317f094bebc8ff7bf8bfc614cebf3f97 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -92,7 +92,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
{
final Collection<CursedWeapon> cws = cwm.getCursedWeapons();
final StringBuilder replyMSG = new StringBuilder(cws.size() * 300);
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cwinfo.htm");
for (CursedWeapon cw : cwm.getCursedWeapons())
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 257e1d363f2a867ece5bcc0e308ee2d377cc04d0..42ca9167387e5e14ab45d2406e0417cf5fff489b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -871,7 +871,7 @@ public class AdminEditChar implements IAdminCommandHandler
charactersEnd = charactersStart + maxCharactersPerPage;
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charlist.htm");
final StringBuilder replyMSG = new StringBuilder(1000);
@@ -946,7 +946,7 @@ public class AdminEditChar implements IAdminCommandHandler
ip = client.getConnection().getInetAddress().getHostAddress();
}
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/" + filename);
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
@@ -1133,7 +1133,7 @@ public class AdminEditChar implements IAdminCommandHandler
int CharactersFound = 0;
String name;
L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charfind.htm");
final StringBuilder replyMSG = new StringBuilder(1000);
@@ -1203,7 +1203,7 @@ public class AdminEditChar implements IAdminCommandHandler
L2GameClient client;
String name, ip = "0.0.0.0";
final StringBuilder replyMSG = new StringBuilder(1000);
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ipfind.htm");
for (L2PcInstance player : players)
{
@@ -1289,7 +1289,7 @@ public class AdminEditChar implements IAdminCommandHandler
chars = player.getAccountChars();
account = player.getAccountName();
final StringBuilder replyMSG = new StringBuilder(chars.size() * 20);
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/accountinfo.htm");
for (String charname : chars.values())
{
@@ -1368,7 +1368,7 @@ public class AdminEditChar implements IAdminCommandHandler
StringUtil.append(results, "<a action=\"bypass -h admin_find_ip " + dualboxIP + "\">" + dualboxIP + " (" + dualboxIPs.get(dualboxIP) + ")</a><br1>");
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
@@ -1432,7 +1432,7 @@ public class AdminEditChar implements IAdminCommandHandler
StringUtil.append(results, "<a action=\"bypass -h admin_find_ip " + dualboxIP.ip + "\">" + dualboxIP.ip + " (" + dualboxIPs.get(dualboxIP) + ")</a><br1>");
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/dualbox.htm");
adminReply.replace("%multibox%", String.valueOf(multibox));
adminReply.replace("%results%", results.toString());
@@ -1516,7 +1516,7 @@ public class AdminEditChar implements IAdminCommandHandler
private void gatherSummonInfo(L2Summon target, L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petinfo.htm");
String name = target.getName();
html.replace("%name%", name == null ? "N/A" : name);
@@ -1555,7 +1555,7 @@ public class AdminEditChar implements IAdminCommandHandler
private void gatherPartyInfo(L2PcInstance target, L2PcInstance activeChar)
{
boolean color = true;
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/partyinfo.htm");
StringBuilder text = new StringBuilder(400);
for (L2PcInstance member : target.getParty().getMembers())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
index fa9b1801a003570890860b890092dd8b0b810e45..f7da974e20daa29182307e7198aa4df00151618b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java
@@ -337,7 +337,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
if (category.equalsIgnoreCase("stats") || category.equalsIgnoreCase("ai") || category.equalsIgnoreCase("elementals") || category.equalsIgnoreCase("visuals"))
{
- NpcHtmlMessage html = new NpcHtmlMessage(5, 1);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/editnpc-" + category.toLowerCase() + ".htm");
html.replace("%npcId%", String.valueOf(npc.getId()));
@@ -937,7 +937,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
final int PAGE_SIZE = 20;
- NpcHtmlMessage html = new NpcHtmlMessage(5, 1);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/editnpc-skills.htm");
html.replace("%npcId%", String.valueOf(npc.getId()));
@@ -1064,7 +1064,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
final int PAGE_SIZE = 20;
- NpcHtmlMessage html = new NpcHtmlMessage(5, 1);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/editnpc-drops.htm");
html.replace("%npcId%", String.valueOf(npc.getId()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
index 13e2718afd3d7e93a55985b2beb47ea89e8e096e..29d8108877f980882b6823b242af8a152df8d84c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java
@@ -122,7 +122,7 @@ public class AdminEventEngine implements IAdminCommandHandler
String eventName = command.substring(16);
try
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(Config.DATAPACK_ROOT + "/data/events/" + eventName)));
BufferedReader inbr = new BufferedReader(new InputStreamReader(in));
@@ -227,7 +227,7 @@ public class AdminEventEngine implements IAdminCommandHandler
activeChar.sendPacket(_snd);
activeChar.broadcastPacket(_snd);
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final String replyMSG = StringUtil.concat("<html><title>[ L2J EVENT ENGINE ]</title><body><br>", "<center>The event <font color=\"LEVEL\">", L2Event._eventName, "</font> has been announced, now you can type //event_panel to see the event panel control</center><br>", "</body></html>");
adminReply.setHtml(replyMSG);
@@ -477,7 +477,7 @@ public class AdminEventEngine implements IAdminCommandHandler
public void showMainPage(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final String replyMSG = StringUtil.concat("<html><title>[ L2J EVENT ENGINE ]</title><body>" + "<br><center><button value=\"Create NEW event \" action=\"bypass -h admin_event_new\" width=150 height=32 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">" + "<center><br><font color=LEVEL>Stored Events:</font><br></center>", showStoredEvents(), "</body></html>");
adminReply.setHtml(replyMSG);
@@ -486,7 +486,7 @@ public class AdminEventEngine implements IAdminCommandHandler
public void showNewEventPage(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = StringUtil.startAppend(500, "<html><title>[ L2J EVENT ENGINE ]</title><body><br><br><center><font color=LEVEL>Event name:</font><br>");
@@ -527,7 +527,7 @@ public class AdminEventEngine implements IAdminCommandHandler
public void showEventParameters(L2PcInstance activeChar, int teamnumbers)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
StringBuilder sb = new StringBuilder();
sb.append("<html><body><title>[ L2J EVENT ENGINE ]</title><br><center> Current event: <font color=\"LEVEL\">");
@@ -565,7 +565,7 @@ public class AdminEventEngine implements IAdminCommandHandler
private void showEventControl(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
StringBuilder sb = new StringBuilder();
sb.append("<html><title>[ L2J EVENT ENGINE ]</title><body><br><center>Current event: <font color=\"LEVEL\">");
sb.append(L2Event._eventName);
@@ -602,7 +602,7 @@ public class AdminEventEngine implements IAdminCommandHandler
player.addItem("Event", id, num, activeChar, true);
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml("<html><body> CONGRATULATIONS! You should have been rewarded. </body></html>");
player.sendPacket(adminReply);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
index a4c7f8fe117ead49fd62a6fda53e4eeb47fb0b90..a5c1a94c38b5d7938bc51c2fe1b05850a9e6f13d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEvents.java
@@ -151,7 +151,7 @@ public class AdminEvents implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/gm_events.htm");
final StringBuilder cList = new StringBuilder(500);
for (Quest event : QuestManager.getInstance().getAllManagedScripts())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
index 23ab2363cbc85069ca976e2cb3a36c44de226678..bb3a49e5000784a037206a0dbd416c02e40d3e67 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java
@@ -101,7 +101,7 @@ public class AdminExpSp implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/expsp.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 5cb82c118a13f0e26fc5eb9e4296beaadec6a7a5..d420122de98dac7128cdb3b14574b28f5f017a34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -120,7 +120,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
npc2 = NpcTable.getInstance().getTemplate(mid2);
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final String replyMSG;
@@ -300,7 +300,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
double maxHp2 = npc2.getMaxHp();
int hp2 = (int) ((Formulas.calcHpRegen(npc2) * 100000) / Formulas.getRegeneratePeriod(npc2));
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = StringUtil.startAppend(1000, "<html><title>Selected mobs to fight</title>" + "<body>" + "<table>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 6a4ab797eead2b9405a873b835844f9d6dca93b4..d0a76bc9c39eb7c381078d0830bed646042ee025 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -146,7 +146,7 @@ public class AdminFortSiege implements IAdminCommandHandler
private void showFortSelectPage(L2PcInstance activeChar)
{
int i = 0;
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/forts.htm");
final List<Fort> forts = FortManager.getInstance().getForts();
@@ -173,7 +173,7 @@ public class AdminFortSiege implements IAdminCommandHandler
private void showFortSiegePage(L2PcInstance activeChar, Fort fort)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/fort.htm");
adminReply.replace("%fortName%", fort.getName());
adminReply.replace("%fortId%", String.valueOf(fort.getFortId()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
index de67eb5b2a33059ebe42686a79ebd32191a6106f..eed989e5750f26044695d7bfcc1cb612bdc5b78a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java
@@ -62,7 +62,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/graciaseeds.htm");
html.replace("%sodstate%", String.valueOf(GraciaSeedsManager.getInstance().getSoDState()));
html.replace("%sodtiatkill%", String.valueOf(GraciaSeedsManager.getInstance().getSoDTiatKilled()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
index 643ff792fc95367312b49ab61c5be9874a1306a4..59e9c74b7c0a4a6a9c7382a384f2885f87db5dc1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
@@ -81,7 +81,7 @@ public class AdminHellbound implements IAdminCommandHandler
private void showMenu(L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/hellbound.htm");
html.replace("%hbstage%", String.valueOf(HellboundManager.getInstance().getLevel()));
html.replace("%trust%", String.valueOf(HellboundManager.getInstance().getTrust()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java
index a7c5a480e8812c909f00e445bbd7368d69a3fefe..4fac5f979beaa3271112070dce032518b403d769 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java
@@ -101,7 +101,7 @@ public class AdminHtml implements IAdminCommandHandler
File file = new File(Config.DATAPACK_ROOT, path);
content = HtmCache.getInstance().loadFile(file);
}
- final NpcHtmlMessage html = new NpcHtmlMessage(5);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
if (content != null)
{
html.setHtml(content);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 7ea1a36b791ca631e06057bbc99160d69e7b3eb6..ec5fbed29a4d486a2f03272bfc08847aacee5db6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -138,7 +138,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
StringUtil.append(html, "</table></html>");
- NpcHtmlMessage ms = new NpcHtmlMessage(1);
+ final NpcHtmlMessage ms = new NpcHtmlMessage();
ms.setHtml(html.toString());
activeChar.sendPacket(ms);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
index 99e6327dde3d23778a6fad362449c929abcde730..0d30c191c49fbc68537f9a7b706318c8e8187379 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
@@ -167,7 +167,7 @@ public class AdminLogin implements IAdminCommandHandler
*/
private void showMainPage(L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(1);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/login.htm");
html.replace("%server_name%", LoginServerThread.getInstance().getServerName());
html.replace("%status%", LoginServerThread.getInstance().getStatusString());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
index 8612dbb2bc5b4916a61d2ef8fddc49c5603b9346..e39617180b1a1a7282cd1fefd55f97109254e244 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java
@@ -164,7 +164,7 @@ public class AdminManor implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final List<Castle> castles = CastleManager.getInstance().getCastles();
final StringBuilder replyMSG = StringUtil.startAppend(1000 + (castles.size() * 50), "<html><body>" + "<center><table width=270><tr>" + "<td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "<td width=180><center>Manor Info</center></td>" + "<td width=45><button value=\"Back\" action=\"bypass -h admin_admin2\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "</tr></table><font color=\"LEVEL\"> [Manor System] </font></center><br>" + "<table width=\"100%\"><tr><td>" + "Disabled: ", CastleManorManager.getInstance().isDisabled() ? "yes" : "no", "</td><td>" + "Under Maintenance: ", CastleManorManager.getInstance().isUnderMaintenance() ? "yes" : "no", "</td></tr><tr><td>" + "Time to refresh: ", formatTime(CastleManorManager.getInstance().getMillisToManorRefresh()), "</td><td>" + "Time to approve: ", formatTime(CastleManorManager.getInstance().getMillisToNextPeriodApprove()), "</td></tr>" + "</table>" + "<center><table><tr><td>" + "<button value=\"Set Next\" action=\"bypass -h admin_manor_setnext\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td>" + "<button value=\"Approve Next\" action=\"bypass -h admin_manor_approve\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td>" + "<button value=\"", CastleManorManager.getInstance().isUnderMaintenance() ? "Set normal" : "Set mainteance", "\" action=\"bypass -h admin_manor_setmaintenance\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td>" + "<button value=\"", CastleManorManager.getInstance().isDisabled() ? "Enable" : "Disable", "\" action=\"bypass -h admin_manor_disable\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr><tr><td>" + "<button value=\"Refresh\" action=\"bypass -h admin_manor\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td>" + "<button value=\"Back\" action=\"bypass -h admin_admin\" width=110 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>" + "</table></center>" + "<br><center>Castle Information:<table width=\"100%\">" + "<tr><td></td><td>Current Period</td><td>Next Period</td></tr>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
index b309a3b442be1c3057db243338ba623f24425dce..35768240f1620b17c1066843eb534b5f3a84692b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
@@ -207,7 +207,7 @@ public class AdminPForge implements IAdminCommandHandler
private void showPage2(L2PcInstance activeChar, String format)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/pforge2.htm");
adminReply.replace("%format%", format);
@@ -230,7 +230,7 @@ public class AdminPForge implements IAdminCommandHandler
private void showPage3(L2PcInstance activeChar, String format, String command)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/pforge3.htm");
adminReply.replace("%format%", format);
adminReply.replace("%command%", command);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java
index 263cdefafa425b1e9b6cf2f558878c8566575044..c2051e2a943ec31f4f0d9d750dcd78677049878a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPcCondOverride.java
@@ -49,7 +49,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler
{
case "admin_exceptions":
{
- NpcHtmlMessage msg = new NpcHtmlMessage(5, 1);
+ final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/cond_override.htm");
StringBuilder sb = new StringBuilder();
for (PcCondOverride ex : PcCondOverride.values())
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java
index 044dd15e9c588b9f314caca3152c59580b3aa9c3..1a06cad8ae6bfcb88b6967317c63322aaf7d4543 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java
@@ -75,7 +75,7 @@ public class AdminPunishment implements IAdminCommandHandler
{
content = content.replaceAll("%punishments%", Util.implode(PunishmentType.values(), ";"));
content = content.replaceAll("%affects%", Util.implode(PunishmentAffect.values(), ";"));
- activeChar.sendPacket(new NpcHtmlMessage(5, 5, content));
+ activeChar.sendPacket(new NpcHtmlMessage(0, 1, content));
}
else
{
@@ -138,7 +138,7 @@ public class AdminPunishment implements IAdminCommandHandler
content = content.replaceAll("%punishments%", sb.toString());
content = content.replaceAll("%affects%", Util.implode(PunishmentAffect.values(), ";"));
content = content.replaceAll("%affect_type%", affect.name());
- activeChar.sendPacket(new NpcHtmlMessage(5, 5, content));
+ activeChar.sendPacket(new NpcHtmlMessage(0, 1, content));
}
else
{
@@ -162,7 +162,7 @@ public class AdminPunishment implements IAdminCommandHandler
content = content.replaceAll("%acc%", target.getAccountName());
content = content.replaceAll("%char%", target.getName());
content = content.replaceAll("%ip%", target.getIPAddress());
- activeChar.sendPacket(new NpcHtmlMessage(5, 5, content));
+ activeChar.sendPacket(new NpcHtmlMessage(0, 1, content));
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 6956824705994a9ac5d48550bcc5f3e6f00ef97b..9bf4165e57bfc1798f0640d0249ff4a4e80fb90a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -195,7 +195,7 @@ public class AdminQuest implements IAdminCommandHandler
else
{
L2Npc npc = L2Npc.class.cast(activeChar.getTarget());
- NpcHtmlMessage msg = new NpcHtmlMessage(npc.getObjectId(), 1);
+ final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
StringBuilder sb = new StringBuilder();
Set<String> questset = new HashSet<>();
@@ -238,7 +238,7 @@ public class AdminQuest implements IAdminCommandHandler
}
L2Npc npc = L2Npc.class.cast(activeChar.getTarget());
StringBuilder sb = new StringBuilder();
- NpcHtmlMessage msg = new NpcHtmlMessage(npc.getObjectId(), 1);
+ final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1);
msg.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npc-quests.htm");
String events = "", npcs = "", items = "", timers = "";
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
index 5a097e561b50396315cba789159fa964403be30c..052f6f86a07c86d9eac222d8c85d4dd0926d9afe 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
@@ -159,7 +159,7 @@ public class AdminShowQuests implements IAdminCommandHandler
private static void showFirstQuestMenu(L2PcInstance target, L2PcInstance actor)
{
TextBuilder replyMSG = new TextBuilder("<html><body><table width=270><tr><td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Player: " + target.getName() + "</center></td><td width=45><button value=\"Back\" action=\"bypass -h admin_admin6\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
int ID = target.getObjectId();
replyMSG.append("Quest Menu for <font color=\"LEVEL\">" + target.getName() + "</font> (ID:" + ID + ")<br><center>");
@@ -183,7 +183,7 @@ public class AdminShowQuests implements IAdminCommandHandler
int ID = target.getObjectId();
TextBuilder replyMSG = new TextBuilder("<html><body>");
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
if (val[0].equals("full"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
index 53836925412d6ba293a15ed4fb44fbbd43cbd7c2..d40ef3c805a74399169168c23bfc59bc55a1f6b3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java
@@ -104,7 +104,7 @@ public class AdminShutdown implements IAdminCommandHandler
private void sendHtmlForm(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
int t = GameTimeController.getInstance().getGameTime();
int h = t / 60;
int m = t % 60;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index dbbbd11fe4c9b12cb3885ec1ab2833f19c48e585..6152c05f94e49e0e27266a03197f83077c64749a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -314,7 +314,7 @@ public class AdminSiege implements IAdminCommandHandler
private void showCastleSelectPage(L2PcInstance activeChar)
{
int i = 0;
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castles.htm");
final StringBuilder cList = new StringBuilder(500);
for (Castle castle : CastleManager.getInstance().getCastles())
@@ -390,7 +390,7 @@ public class AdminSiege implements IAdminCommandHandler
*/
private void showSiegePage(L2PcInstance activeChar, String castleName)
{
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castle.htm");
adminReply.replace("%castleName%", castleName);
activeChar.sendPacket(adminReply);
@@ -403,7 +403,7 @@ public class AdminSiege implements IAdminCommandHandler
*/
private void showSiegeTimePage(L2PcInstance activeChar, Castle castle)
{
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/castlesiegetime.htm");
adminReply.replace("%castleName%", castle.getName());
adminReply.replace("%time%", castle.getSiegeDate().getTime().toString());
@@ -449,7 +449,7 @@ public class AdminSiege implements IAdminCommandHandler
*/
private void showClanHallPage(L2PcInstance activeChar, ClanHall clanhall)
{
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/clanhall.htm");
adminReply.replace("%clanhallName%", clanhall.getName());
adminReply.replace("%clanhallId%", String.valueOf(clanhall.getId()));
@@ -465,7 +465,7 @@ public class AdminSiege implements IAdminCommandHandler
*/
private void showSiegableHallPage(L2PcInstance activeChar, SiegableHall hall)
{
- final NpcHtmlMessage msg = new NpcHtmlMessage(5);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(null, "data/html/admin/siegablehall.htm");
msg.replace("%clanhallId%", String.valueOf(hall.getId()));
msg.replace("%clanhallName%", hall.getName());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index be46486a8c745c2d86b65041ae551667b8f39c3f..e9d7ce63861879ff32508e4adaa7bed6f7d75400 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -306,7 +306,7 @@ public class AdminSkill implements IAdminCommandHandler
skillsEnd = skillsStart + maxSkillsPerPage;
}
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = StringUtil.startAppend(500 + (maxPages * 50) + (((skillsEnd - skillsStart) + 1) * 50), "<html><body>" + "<table width=260><tr>" + "<td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "<td width=180><center>Character Selection Menu</center></td>" + "<td width=40><button value=\"Back\" action=\"bypass -h admin_show_skills\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "</tr></table>" + "<br><br>" + "<center>Editing <font color=\"LEVEL\">", player.getName(), "</font></center>" + "<br><table width=270><tr><td>Lv: ", String.valueOf(player.getLevel()), " ", ClassListData.getInstance().getClass(player.getClassId()).getClientCode(), "</td></tr></table>" + "<br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr>" + "<tr><td>ruin the game...</td></tr></table>" + "<br><center>Click on the skill you wish to remove:</center>" + "<br>" + "<center><table width=270><tr>");
for (int x = 0; x < maxPages; x++)
@@ -339,7 +339,7 @@ public class AdminSkill implements IAdminCommandHandler
return;
}
final L2PcInstance player = target.getActingPlayer();
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charskills.htm");
adminReply.replace("%name%", player.getName());
adminReply.replace("%level%", String.valueOf(player.getLevel()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index fedf4554f3d09d7b394e169105ff1455a4301929..d7e6c3fa9dc750f5cad75843047a3bbd65a9c8f0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -195,7 +195,7 @@ public class AdminSpawn implements IAdminCommandHandler
}
}
StringUtil.append(html, "<tr><td>Skipped:</td><td>" + String.valueOf(skiped) + "</td></tr></table></body></html>");
- NpcHtmlMessage ms = new NpcHtmlMessage(1);
+ final NpcHtmlMessage ms = new NpcHtmlMessage();
ms.setHtml(html.toString());
activeChar.sendPacket(ms);
}
@@ -487,7 +487,7 @@ public class AdminSpawn implements IAdminCommandHandler
StringUtil.append(tb, "<br><center><button value=\"Next\" action=\"bypass -h admin_spawn_index ", Integer.toString(level), " ", Integer.toString(i), "\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><button value=\"Back\" action=\"bypass -h admin_show_spawns\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
}
- activeChar.sendPacket(new NpcHtmlMessage(5, tb.toString()));
+ activeChar.sendPacket(new NpcHtmlMessage(tb.toString()));
}
private void showNpcs(L2PcInstance activeChar, String starting, int from)
@@ -512,6 +512,6 @@ public class AdminSpawn implements IAdminCommandHandler
StringUtil.append(tb, "<br><center><button value=\"Next\" action=\"bypass -h admin_npc_index ", starting, " ", Integer.toString(i), "\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><button value=\"Back\" action=\"bypass -h admin_show_npcs\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
}
- activeChar.sendPacket(new NpcHtmlMessage(5, tb.toString()));
+ activeChar.sendPacket(new NpcHtmlMessage(tb.toString()));
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 43463609c4f396f5ce22be519d64095b2acc2c4b..a9e7dfaa80ce2e56b80a24c405f35d811a97f3d5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -374,7 +374,7 @@ public class AdminTeleport implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
return;
}
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final String replyMSG = StringUtil.concat("<html><title>Teleport Character</title>" + "<body>" + "The character you will teleport is ", player.getName(), "." + "<br>" + "Co-ordinate x" + "<edit var=\"char_cord_x\" width=110>" + "Co-ordinate y" + "<edit var=\"char_cord_y\" width=110>" + "Co-ordinate z" + "<edit var=\"char_cord_z\" width=110>" + "<button value=\"Teleport\" action=\"bypass -h admin_teleport_character $char_cord_x $char_cord_y $char_cord_z\" width=60 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">" + "<button value=\"Teleport near you\" action=\"bypass -h admin_teleport_character ", String.valueOf(activeChar.getX()), " ", String.valueOf(activeChar.getY()), " ", String.valueOf(activeChar.getZ()), "\" width=115 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">" + "<center><button value=\"Back\" action=\"bypass -h admin_current_player\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center>" + "</body></html>");
adminReply.setHtml(replyMSG);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
index 476be11b17f9cb685fd0d38366e9a8ffcdb32e4c..42de0f1ff5d94ed37cf9bb9bf867c6a855c08b81 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
@@ -122,7 +122,7 @@ public class AdminTerritoryWar implements IAdminCommandHandler
else if (command.equalsIgnoreCase("admin_territory_wards_list"))
{
// build beginning of html page
- NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(1, 1);
+ final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(0, 1);
StringBuilder sb = new StringBuilder();
sb.append("<html><title>Territory War</title><body><br><center><font color=\"LEVEL\">Active Wards List:</font></center>");
@@ -170,7 +170,7 @@ public class AdminTerritoryWar implements IAdminCommandHandler
private void showSiegeTimePage(L2PcInstance activeChar)
{
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/territorywartime.htm");
adminReply.replace("%time%", TerritoryWarManager.getInstance().getTWStart().getTime().toString());
activeChar.sendPacket(adminReply);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index a592af9275c37a98aaf3c116825df0523378f0c4..788e40f232647d7c0a28a823bf884c7706c6ff31 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -109,7 +109,7 @@ public class AdminZone implements IAdminCommandHandler
private static void showHtml(L2PcInstance activeChar)
{
final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/admin/zone.htm");
- NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml(htmContent);
adminReply.replace("%PEACE%", (activeChar.isInsideZone(ZoneId.PEACE) ? "<font color=\"LEVEL\">YES</font>" : "NO"));
adminReply.replace("%PVP%", (activeChar.isInsideZone(ZoneId.PVP) ? "<font color=\"LEVEL\">YES</font>" : "NO"));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BuyShadowItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BuyShadowItem.java
index 42e18e9e6acc23b1386172749f0bc0f1ff05b384..6c420ba42ba5132e4b83d637caa1cf708c22d890 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BuyShadowItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/BuyShadowItem.java
@@ -40,7 +40,7 @@ public class BuyShadowItem implements IBypassHandler
return false;
}
- NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
if (activeChar.getLevel() < 40)
{
html.setFile(activeChar.getHtmlPrefix(), "data/html/common/shadow_item-lowlevel.htm");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
index 04290e8e5dc1e4c56211f0bbc981a515ef4d7c46..f05d9ee9e490bb83580851e4e67fdbbdc261dcdf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
@@ -76,7 +76,7 @@ public class ClanWarehouse implements IBypassHandler
{
if (Config.L2JMOD_ENABLE_WAREHOUSESORTING_CLAN)
{
- NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
+ final NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/WhSortedC.htm");
msg.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(msg);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
index 7d6641da768a3dde2580bdd5c0d91d0ce28e6292..89b11566d5ab758e1a152da88bcc20646c9758be 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Festival.java
@@ -267,7 +267,7 @@ public class Festival implements IBypassHandler
StringUtil.append(strBuffer, "<a action=\"bypass -h npc_", String.valueOf(npc.getObjectId()), "_Chat 0\">Go back.</a></body></html>");
- NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(strBuffer.toString());
activeChar.sendPacket(html);
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Link.java
index d472a052e7cd1716240af9fa879d9fd654803563..67ed8c95385791fb2f15b006a6b9418801da92c5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Link.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Link.java
@@ -18,11 +18,8 @@
*/
package handlers.bypasshandlers;
-import java.util.logging.Level;
-
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -36,30 +33,25 @@ public class Link implements IBypassHandler
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
- if (!target.isNpc())
+ String htmlPath = command.substring(4).trim();
+ if (htmlPath.isEmpty())
{
+ _log.warning("Player " + activeChar.getName() + " sent empty link html!");
return false;
}
- try
- {
- String path = command.substring(5).trim();
- if (path.indexOf("..") != -1)
- {
- return false;
- }
- String filename = "data/html/" + path;
- NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
- html.setFile(activeChar.getHtmlPrefix(), filename);
- html.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
- activeChar.sendPacket(html);
- return true;
- }
- catch (Exception e)
+ if (htmlPath.contains(".."))
{
- _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);
+ _log.warning("Player " + activeChar.getName() + " sent invalid link html: " + htmlPath);
+ return false;
}
- return false;
+
+ String filename = "data/html/" + htmlPath;
+ final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0);
+ html.setFile(activeChar.getHtmlPrefix(), filename);
+ html.replace("%objectId%", String.valueOf(target != null ? target.getObjectId() : 0));
+ activeChar.sendPacket(html);
+ return true;
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
index 97f5f8d4454c865c9d5c8263df5242b9d92d3098..60638d60b77b5fbff2320cee8a0d61aac6612a2d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java
@@ -96,7 +96,7 @@ public class Loto implements IBypassHandler
int npcId = npc.getTemplate().getId();
String filename;
SystemMessage sm;
- NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
if (val == 0) // 0 - first buy lottery ticket window
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
index 9f2667ae8a97715ec105723895f5730249773f81..c23a5026945e65ea41ae947a143b6c9bbd5cc33e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
@@ -233,7 +233,7 @@ public class OlympiadManagerLink implements IBypassHandler
return false;
}
- NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
String[] params = command.split(" ");
if (params[1] == null)
@@ -288,7 +288,7 @@ public class OlympiadManagerLink implements IBypassHandler
{
int val = Integer.parseInt(command.substring(9, 10));
- NpcHtmlMessage reply = new NpcHtmlMessage(target.getObjectId());
+ final NpcHtmlMessage reply = new NpcHtmlMessage(target.getObjectId());
switch (val)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java
index 726c276ddb9b36e0df49804b324ac360dd71116c..52cf56f2e4d891bce4cef83cc8c618f48d00f657 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java
@@ -52,15 +52,15 @@ public class PlayerHelp implements IBypassHandler
final StringTokenizer st = new StringTokenizer(path);
final String[] cmd = st.nextToken().split("#");
- NpcHtmlMessage html;
+ final NpcHtmlMessage html;
if (cmd.length > 1)
{
final int itemId = Integer.parseInt(cmd[1]);
- html = new NpcHtmlMessage(1, itemId);
+ html = new NpcHtmlMessage(0, itemId);
}
else
{
- html = new NpcHtmlMessage(1);
+ html = new NpcHtmlMessage();
}
html.setFile(activeChar.getHtmlPrefix(), "data/html/help/" + cmd[0]);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
index 60b8f8bf86c5cb951f38993f6343e1bfa87cf275..a104006140df194459ee862a414a8400cedd73e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java
@@ -61,7 +61,7 @@ public class PrivateWarehouse implements IBypassHandler
{
if (Config.L2JMOD_ENABLE_WAREHOUSESORTING_PRIVATE)
{
- NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
+ final NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/WhSortedP.htm");
msg.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(msg);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index cd659b7ad273a5eefcb94372ecb45fb59ce2a623..b4ab8f8725807b8c1d2836b2bd1507b840fd6422 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -48,11 +48,6 @@ public class QuestLink implements IBypassHandler
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
- if (!target.isNpc())
- {
- return false;
- }
-
String quest = "";
try
{
@@ -67,7 +62,15 @@ public class QuestLink implements IBypassHandler
}
else
{
- showQuestWindow(activeChar, (L2Npc) target, quest);
+ int questNameEnd = quest.indexOf(" ");
+ if (questNameEnd == -1)
+ {
+ showQuestWindow(activeChar, (L2Npc) target, quest);
+ }
+ else
+ {
+ activeChar.processQuestEvent(quest.substring(0, questNameEnd), quest.substring(questNameEnd).trim());
+ }
}
return true;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
index ed014a8e53cb7bf02ce2e05b8e45a632bf5377c0..5c5a3bca87f16a5d7d00e7f0c44a5ac451f4dfb0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
@@ -61,7 +61,7 @@ public class RentPet implements IBypassHandler
if (st.countTokens() < 1)
{
- NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
+ final NpcHtmlMessage msg = new NpcHtmlMessage(((L2Npc) target).getObjectId());
msg.setHtml("<html><body>Pet Manager:<br>" + "You can rent a wyvern or strider for adena.<br>My prices:<br1>" + "<table border=0><tr><td>Ride</td></tr>" + "<tr><td>Wyvern</td><td>Strider</td></tr>" + "<tr><td><a action=\"bypass -h npc_%objectId%_RentPet 1\">30 sec/1800 adena</a></td><td><a action=\"bypass -h npc_%objectId%_RentPet 11\">30 sec/900 adena</a></td></tr>" + "<tr><td><a action=\"bypass -h npc_%objectId%_RentPet 2\">1 min/7200 adena</a></td><td><a action=\"bypass -h npc_%objectId%_RentPet 12\">1 min/3600 adena</a></td></tr>" + "<tr><td><a action=\"bypass -h npc_%objectId%_RentPet 3\">10 min/720000 adena</a></td><td><a action=\"bypass -h npc_%objectId%_RentPet 13\">10 min/360000 adena</a></td></tr>" + "<tr><td><a action=\"bypass -h npc_%objectId%_RentPet 4\">30 min/6480000 adena</a></td><td><a action=\"bypass -h npc_%objectId%_RentPet 14\">30 min/3240000 adena</a></td></tr>" + "</table>" + "</body></html>");
msg.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(msg);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java
index ce08daa992691d159413a3bcd5fc291fce0d4883..dd11eda9cab979c05cfd4d94d1d7508e81e9c560 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java
@@ -111,7 +111,7 @@ public class SkillList implements IBypassHandler
}
text += "</body></html>";
- NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
+ final NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
html.setHtml(text);
html.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
activeChar.sendPacket(html);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
index f7a1a257cf3b4bb8d57afc39ff310802e4faf29b..74a5169ffd810b66cb728bd314a576deb246094f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Book.java
@@ -46,13 +46,13 @@ public class Book implements IItemHandler
if (content == null)
{
- NpcHtmlMessage html = new NpcHtmlMessage(1);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, item.getId());
html.setHtml("<html><body>My Text is missing:<br>" + filename + "</body></html>");
activeChar.sendPacket(html);
}
else
{
- NpcHtmlMessage itemReply = new NpcHtmlMessage(5, itemId);
+ final NpcHtmlMessage itemReply = new NpcHtmlMessage(0, item.getId());
itemReply.setHtml(content);
itemReply.disableValidation();
activeChar.sendPacket(itemReply);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Bypass.java
index 2a7002a7eefa2e3535906d8e1623b1b908760bd5..a736b3b999672afd057a47e2deae8a967f00f563 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Bypass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/Bypass.java
@@ -42,7 +42,7 @@ public class Bypass implements IItemHandler
String filename = "data/html/item/" + itemId + ".htm";
String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
- NpcHtmlMessage html = new NpcHtmlMessage(0, itemId);
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, item.getId());
if (content == null)
{
html.setHtml("<html><body>My Text is missing:<br>" + filename + "</body></html>");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
index cc892812d393773570f2512a2ab00cffb1340a17..c39964899e3c766047f4f602055b206a2030ce28 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
@@ -165,7 +165,7 @@ public class JailHandler extends PlayerSpawnListener implements IPunishmentHandl
ThreadPoolManager.getInstance().scheduleGeneral(new TeleportTask(player, L2JailZone.getLocationIn()), 2000);
// Open a Html message to inform the player
- final NpcHtmlMessage msg = new NpcHtmlMessage(0);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/jail_in.htm");
if (content != null)
{
@@ -201,7 +201,7 @@ public class JailHandler extends PlayerSpawnListener implements IPunishmentHandl
ThreadPoolManager.getInstance().scheduleGeneral(new TeleportTask(player, L2JailZone.getLocationOut()), 2000);
// Open a Html message to inform the player
- final NpcHtmlMessage msg = new NpcHtmlMessage(0);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
String content = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/jail_out.htm");
if (content != null)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
index e2b75e85b548a9689fb29553e72018078ed483dc..2339199f2384717d6f1153476a100766ddd496bb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
@@ -73,7 +73,7 @@ public class ClanPenalty implements IUserCommandHandler
htmlContent.append("</tr></table><img src=\"L2UI.SquareWhite\" width=270 height=1></center></body></html>");
- final NpcHtmlMessage penaltyHtml = new NpcHtmlMessage(0);
+ final NpcHtmlMessage penaltyHtml = new NpcHtmlMessage();
penaltyHtml.setHtml(htmlContent.toString());
activeChar.sendPacket(penaltyHtml);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
index fd6dc9a686ca616be6eb1b03c2681fab6f65793b..16df026a0db2f77b1e336d635f5c3b4403932c9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
@@ -99,7 +99,7 @@ public class ChangePassword implements IVoicedCommandHandler
{
html = "<html><body><br><br><center><font color=LEVEL>404:</font> File Not Found</center></body></html>";
}
- activeChar.sendPacket(new NpcHtmlMessage(1, html));
+ activeChar.sendPacket(new NpcHtmlMessage(html));
return true;
}
return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
index 3760fed0b567122154f9f6a40469afac5cc7d3f4..5e7936144f3e0861e17fe07083710e9fd99ed1e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
@@ -41,7 +41,7 @@ public class Lang implements IVoicedCommandHandler
return false;
}
- final NpcHtmlMessage msg = new NpcHtmlMessage(1);
+ final NpcHtmlMessage msg = new NpcHtmlMessage();
if (params == null)
{
final StringBuilder html = StringUtil.startAppend(100);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java
index 96bc371cde4bba434568102da5cf2ada23945286..590a697922a738b6c70e5bf5adbab4e821c6e029 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java
@@ -73,7 +73,7 @@ public class StatsVCmd implements IVoicedCommandHandler
StringUtil.append(replyMSG, "<font color=\"FF0000\">", plr.getName(), "</font><br>");
}
replyMSG.append("</body></html>");
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setHtml(replyMSG.toString());
activeChar.sendPacket(adminReply);
return true;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
index eaa87537bedd8c9e87a562e014a45ad09fcba6a0..72d340800f8c6e349d34dd348000fbd6fa62357e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
@@ -54,7 +54,7 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
String htmContent = (USE_STATIC_HTML && !HTML.isEmpty()) ? HTML : HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/TvTEvent/Status.htm");
try
{
- NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(5);
+ final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage();
npcHtmlMessage.setHtml(htmContent);
// npcHtmlMessage.replace("%objectId%",
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
index b89c2cfbe815a581563697ee6767d500f1802c2e..39a9a35243dd4ca79ff55db3e3400d6bb684fc2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRace/eventmodRace.java
@@ -434,7 +434,7 @@ public class eventmodRace extends Event
private void showMenu(L2PcInstance activeChar)
{
- NpcHtmlMessage html = new NpcHtmlMessage(0);
+ final NpcHtmlMessage html = new NpcHtmlMessage();
String content = getHtm(activeChar.getHtmlPrefix(), "admin_menu.htm");
html.setHtml(content);
activeChar.sendPacket(html);