From fa1d077a784ba02869e3694d5a0b3b262a82a757 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sat, 18 Jan 2020 21:50:31 -0300
Subject: [PATCH] Fixing HTML path
Reported by: hd321kbps
---
.../TerritoryManagers/TerritoryManagers.java | 37 ++++++++++---------
.../FortressOfResistance.java | 2 +-
.../RainbowSpringsChateau.java | 2 +-
.../HallOfSuffering/HallOfSuffering.java | 2 +-
.../handlers/bypasshandlers/QuestLink.java | 2 +-
.../instances/ChambersOfDelusion/Chamber.java | 10 ++---
.../Q00655_AGrandPlanForTamingWildBeasts.java | 2 +-
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java b/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
index 5aff8c0390..5939b2bf91 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
@@ -40,10 +40,11 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
/**
* Retail AI for Territory Managers.
* @author Zoey76
- * @version 1.1
+ * @version 2.6.1.0
*/
public final class TerritoryManagers extends AbstractNpcAI {
- private static final int[] preciousSoul1ItemIds = {
+
+ private static final int[] PRECIOUS_SOUL_1_ITEM_IDS = {
7587,
7588,
7589,
@@ -51,10 +52,12 @@ public final class TerritoryManagers extends AbstractNpcAI {
7598,
7599
};
- private static final int[] preciousSoul2ItemIds = {
+
+ private static final int[] PRECIOUS_SOUL_2_ITEM_IDS = {
7595
};
- private static final int[] preciousSoul3ItemIds = {
+
+ private static final int[] PRECIOUS_SOUL_3_ITEM_IDS = {
7678,
7591,
7592,
@@ -73,8 +76,8 @@ public final class TerritoryManagers extends AbstractNpcAI {
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player) {
+ // If the player does not have the second class transfer or is under level 40, it cannot continue.
if ((player.getClassId().level() < 2) || (player.getLevel() < 40)) {
- // If the player does not have the second class transfer or is under level 40, it cannot continue.
return "36490-08.html";
}
return npc.getId() + ".html";
@@ -90,7 +93,7 @@ public final class TerritoryManagers extends AbstractNpcAI {
case "36490-04.html": {
// L2J Custom for minimum badges required.
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
- html.setFile(player.getHtmlPrefix(), "data/scripts/ai/npc/TerritoryManagers/36490-04.html");
+ html.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/ai/npc/TerritoryManagers/36490-04.html");
html.replace("%badge%", String.valueOf(territoryWar().getMinTerritoryBadgeForNobless()));
player.sendPacket(html);
break;
@@ -119,11 +122,11 @@ public final class TerritoryManagers extends AbstractNpcAI {
} else {
// Complete the Noblesse related quests.
// Possessor of a Precious Soul - 1 (241)
- processNoblesseQuest(player, 241, preciousSoul1ItemIds);
+ processNoblesseQuest(player, 241, PRECIOUS_SOUL_1_ITEM_IDS);
// Possessor of a Precious Soul - 2 (242)
- processNoblesseQuest(player, 242, preciousSoul2ItemIds);
+ processNoblesseQuest(player, 242, PRECIOUS_SOUL_2_ITEM_IDS);
// Possessor of a Precious Soul - 3 (246)
- processNoblesseQuest(player, 246, preciousSoul3ItemIds);
+ processNoblesseQuest(player, 246, PRECIOUS_SOUL_3_ITEM_IDS);
// Possessor of a Precious Soul - 4 (247)
processNoblesseQuest(player, 247, null);
@@ -167,14 +170,14 @@ public final class TerritoryManagers extends AbstractNpcAI {
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
final String prefix = player.getHtmlPrefix();
if (TerritoryWarManager.getInstance().isTWInProgress() || (reward[0] == 0)) {
- html.setFile(prefix, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html");
+ html.setFile(prefix, "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0a.html");
} else if (reward[0] != territoryId) {
- html.setFile(prefix, "data/scripts/ai/npc/TerritoryManagers/reward-0b.html");
+ html.setFile(prefix, "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} else if (reward[1] == 0) {
- html.setFile(prefix, "data/scripts/ai/npc/TerritoryManagers/reward-0a.html");
+ html.setFile(prefix, "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0a.html");
} else {
- html.setFile(prefix, "data/scripts/ai/npc/TerritoryManagers/reward-1.html");
+ html.setFile(prefix, "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-1.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
html.replace("%badge%", String.valueOf(reward[1]));
html.replace("%adena%", String.valueOf(reward[1] * 5000));
@@ -193,14 +196,14 @@ public final class TerritoryManagers extends AbstractNpcAI {
int[] reward = TerritoryWarManager.getInstance().calcReward(player);
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");
+ html.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0a.html");
} else if (reward[0] != territoryId) {
- html.setFile(player.getHtmlPrefix(), "data/scripts/ai/npc/TerritoryManagers/reward-0b.html");
+ html.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0b.html");
html.replace("%castle%", CastleManager.getInstance().getCastleById(reward[0] - 80).getName());
} else if (reward[1] == 0) {
- html.setFile(player.getHtmlPrefix(), "data/scripts/ai/npc/TerritoryManagers/reward-0a.html");
+ html.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-0a.html");
} else {
- html.setFile(player.getHtmlPrefix(), "data/scripts/ai/npc/TerritoryManagers/reward-2.html");
+ html.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/ai/npc/TerritoryManagers/reward-2.html");
player.addItem("ReceiveRewards", badgeId, reward[1], npc, true);
player.addAdena("ReceiveRewards", reward[1] * 5000, npc, true);
TerritoryWarManager.getInstance().resetReward(player);
diff --git a/src/main/java/com/l2jserver/datapack/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/src/main/java/com/l2jserver/datapack/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index 73644d1d5b..0b2a27168e 100644
--- a/src/main/java/com/l2jserver/datapack/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/src/main/java/com/l2jserver/datapack/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -85,7 +85,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine {
}
private final void buildMessengerMessage() {
- String html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
+ String html = HtmCache.getInstance().getHtm(null, "com/l2jserver/datapack/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
if (html != null) {
// FIXME: We don't have an object id to put in here :(
_messengerMsg = new NpcHtmlMessage();
diff --git a/src/main/java/com/l2jserver/datapack/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/src/main/java/com/l2jserver/datapack/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 9897ff2d13..d90739704e 100644
--- a/src/main/java/com/l2jserver/datapack/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/src/main/java/com/l2jserver/datapack/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -267,7 +267,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine {
final int npcId = npc.getId();
if (npcId == MESSENGER) {
final String main = (_rainbow.getOwnerId() > 0) ? "messenger_yetti001.htm" : "messenger_yetti001a.htm";
- html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/scripts/conquerablehalls/RainbowSpringsChateau/" + main);
+ html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/conquerablehalls/RainbowSpringsChateau/" + main);
html = html.replace("%time%", _registrationEnds);
if (_rainbow.getOwnerId() > 0) {
html = html.replace("%owner%", ClanTable.getInstance().getClan(_rainbow.getOwnerId()).getName());
diff --git a/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java b/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
index 9f786af8bd..a135d33b88 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java
@@ -357,7 +357,7 @@ public final class HallOfSuffering extends AbstractInstance {
}
private String getPtLeaderText(L2PcInstance player, HSWorld world) {
- String htmltext = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/32530-10.htm");
+ String htmltext = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/gracia/instances/SeedOfInfinity/HallOfSuffering/32530-10.htm");
htmltext = htmltext.replaceAll("%ptLeader%", String.valueOf(world.ptLeaderName));
return htmltext;
}
diff --git a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
index 0fe3c71507..0c322ecab6 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
@@ -140,7 +140,7 @@ public class QuestLink implements IBypassHandler {
* Open a quest window on client with the text of the L2NpcInstance.<br>
* <b><u>Actions</u>:</b><br>
* <ul>
- * <li>Get the text of the quest state in the folder data/scripts/quests/questId/stateId.htm</li>
+ * <li>Get the text of the quest state in the folder com/l2jserver/datapack/quests/questId/stateId.htm</li>
* <li>Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance</li>
* <li>Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet</li>
* </ul>
diff --git a/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java b/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
index e598897083..e133d30d82 100644
--- a/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
+++ b/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
@@ -392,11 +392,11 @@ public abstract class Chamber extends AbstractInstance {
// Change room from dialog
if (event.equals("next_room")) {
if (player.getParty() == null) {
- htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_party.html");
+ htmltext = getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/instances/ChambersOfDelusion/no_party.html");
}
else if (player.getParty().getLeaderObjectId() != player.getObjectId()) {
- htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_leader.html");
+ htmltext = getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/instances/ChambersOfDelusion/no_leader.html");
}
else if (hasQuestItems(player, DELUSION_MARK)) {
@@ -406,13 +406,13 @@ public abstract class Chamber extends AbstractInstance {
}
else {
- htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_item.html");
+ htmltext = getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/instances/ChambersOfDelusion/no_item.html");
}
} else if (event.equals("go_out")) {
if (player.getParty() == null) {
- htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_party.html");
+ htmltext = getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/instances/ChambersOfDelusion/no_party.html");
} else if (player.getParty().getLeaderObjectId() != player.getObjectId()) {
- htmltext = getHtm(player.getHtmlPrefix(), "data/scripts/instances/ChambersOfDelusion/no_leader.html");
+ htmltext = getHtm(player.getHtmlPrefix(), "com/l2jserver/datapack/instances/ChambersOfDelusion/no_leader.html");
} else {
final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/src/main/java/com/l2jserver/datapack/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index 5599b0165b..845f7fa495 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -47,7 +47,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest {
private static final int REQUIRED_CRYSTAL_COUNT = 10;
private static final int REQUIRED_CLAN_LEVEL = 4;
private static final int MINUTES_TO_SIEGE = 3600;
- private static final String PATH_TO_HTML = "data/scripts/conquerablehalls/flagwar/WildBeastReserve/messenger_initial.htm";
+ private static final String PATH_TO_HTML = "com/l2jserver/datapack/conquerablehalls/flagwar/WildBeastReserve/messenger_initial.htm";
public Q00655_AGrandPlanForTamingWildBeasts() {
super(655, Q00655_AGrandPlanForTamingWildBeasts.class.getSimpleName(), "A Grand Plan for Taming Wild Beasts");
--
GitLab