From f3249daaca393bad5eb6e595fb5d3e07f0197d0b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 9 Oct 2016 19:21:15 +0000 Subject: [PATCH] Small improvement for Link buypass. --- .../dist/game/data/html/default/30471-4.htm | 2 +- .../dist/game/data/html/default/31960.htm | 2 +- L2J_Mobius_Underground/dist/game/data/html/guard/30071.htm | 4 ++-- L2J_Mobius_Underground/dist/game/data/html/guard/30196.htm | 4 ++-- L2J_Mobius_Underground/dist/game/data/html/guard/30332.htm | 4 ++-- L2J_Mobius_Underground/dist/game/data/html/guard/30916.htm | 4 ++-- L2J_Mobius_Underground/dist/game/data/html/guard/31340.htm | 4 ++-- L2J_Mobius_Underground/dist/game/data/html/guard/31981.htm | 4 ++-- .../dist/game/data/html/merchant/32878.htm | 2 +- .../game/data/scripts/handlers/bypasshandlers/Link.java | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/L2J_Mobius_Underground/dist/game/data/html/default/30471-4.htm b/L2J_Mobius_Underground/dist/game/data/html/default/30471-4.htm index ad4812b18a..cc5fff33a9 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/default/30471-4.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/default/30471-4.htm @@ -5,5 +5,5 @@ You can remove an armor seal and re-seal it here. What is it that you wish done? - + diff --git a/L2J_Mobius_Underground/dist/game/data/html/default/31960.htm b/L2J_Mobius_Underground/dist/game/data/html/default/31960.htm index 912f73f29b..709f165848 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/default/31960.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/default/31960.htm @@ -3,7 +3,7 @@ Welcome! Your timing is impeccable, I just finished up a three-day job repairing - + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/30071.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/30071.htm index 6825f9cfdc..e5c33219a2 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/30071.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/30071.htm @@ -1,8 +1,8 @@ Captain Lucas:
Welcome, young friend. Welcome to Dion! I am Lucas, I handle security for Dion. Is this your first visit? Well, this here is a quiet and law-abiding town. I don't tolerate anyone disturbing the peace!
When you decide to move on, be warned that there's a passel of dangerous areas outside the town. You'd be well advised not to venture out alone. Now, you have a nice stay, ya hear!
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/30196.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/30196.htm index e8bbd0da15..e6ec65ce1a 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/30196.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/30196.htm @@ -3,8 +3,8 @@ Young traveler, welcome to Oren! I am Mouen, responsible to the lord for the sec As you know, we are close to Aden's enemy, the land of Elmore, so security is tighter here than in most towns. Let me apologize now for any inconvenience this may cause you.
Please understand, the residents here are not very different in either appearance or customs, from our neighbors to the north. In fact, to those who make their living cutting down trees, national boundaries mean little. Off the top of my head, I can name at least 10 residents who have relatives or friends in Elmore!
That imposing castle on the northern hill, that's Oren Castle. Whenever I look at it, I pray that Elmore recognizes its power so our residents will not have to suffer the calamity of war ever again.
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/30332.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/30332.htm index d42ed80985..a085bb18b8 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/30332.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/30332.htm @@ -1,7 +1,7 @@ Captain Bathis:
Welcome, young traveler! I am Captain Bathis, the commander of the guard that provides security to both this village and the surrounding area. May I offer you a word of advice? What kind of outfit are you wearing? I understand the desire to be fashionable, particularly among the young...but armor is not for looks. Choose a set capable of protecting you in battle, regardless of what it looks like. Tsk tsk! Young people these days...
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/30916.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/30916.htm index 2587ea2564..9bfb544518 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/30916.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/30916.htm @@ -1,7 +1,7 @@ Captain Gosta:
Welcome to Heine, the jewel of Aden! I am Gosta, charged with maintaining the security of this city. Not only is Heine the capital of Innadril, it is also an important trading hub with Gludio and Giran.
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/31340.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/31340.htm index 943cb81829..410f487326 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/31340.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/31340.htm @@ -1,7 +1,7 @@ Captain Mathias:
Welcome to the capital of Elmore. You must be weary from your long travels; rest and be well in our city. But...do you feel the dark energy spreading these days? The king is worried, and has given me a secret mission regarding this.
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/guard/31981.htm b/L2J_Mobius_Underground/dist/game/data/html/guard/31981.htm index 73430e666c..f23a5e9e63 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/guard/31981.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/guard/31981.htm @@ -1,7 +1,7 @@ Captain Vishotsky:
If a village is peaceful, security must be tight, right? While we're on the subject, let me tell you that a neutral village like this one actually means more work for us guards. If we are vigilant, the inhabitants complain that we are being repressive. If we ease off, they complain that we are lazy. It's very difficult to maintain a happy medium, let me tell you!
- - + + diff --git a/L2J_Mobius_Underground/dist/game/data/html/merchant/32878.htm b/L2J_Mobius_Underground/dist/game/data/html/merchant/32878.htm index 4f98c7db49..d2cd285856 100644 --- a/L2J_Mobius_Underground/dist/game/data/html/merchant/32878.htm +++ b/L2J_Mobius_Underground/dist/game/data/html/merchant/32878.htm @@ -3,6 +3,6 @@ Look, look here. Doesn't it look cramped in here? Right outside is the blue, ope I would escape this coop if I could, but then I can't with customers like you coming along... not that I'm saying you shouldn't come along! How would I get all my news otherwise?
Ah well... lucky you. Wandering around like that...
- + \ No newline at end of file diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java index c29ed9e05e..1ee7660160 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -16,6 +16,7 @@ */ package handlers.bypasshandlers; +import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -44,10 +45,9 @@ public class Link implements IBypassHandler return false; } - final String filename = "data/html/" + htmlPath; + final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "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)); + html.setHtml(content.replace("%objectId%", String.valueOf(target != null ? target.getObjectId() : 0))); activeChar.sendPacket(html); return true; }