From 9f7403662624ba8d4c302042dbcc20c5f2e83bc4 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 29 Jan 2016 14:27:25 +0000
Subject: [PATCH] L2TeleportedInstance duplicate html removal.
---
.../html/teleporter/{nobleteleport-no.htm => nobles_not.htm} | 0
trunk/dist/game/data/html/teleporter/not_nobles.htm | 4 ----
.../gameserver/model/actor/instance/L2TeleporterInstance.java | 4 ++--
3 files changed, 2 insertions(+), 6 deletions(-)
rename trunk/dist/game/data/html/teleporter/{nobleteleport-no.htm => nobles_not.htm} (100%)
delete mode 100644 trunk/dist/game/data/html/teleporter/not_nobles.htm
diff --git a/trunk/dist/game/data/html/teleporter/nobleteleport-no.htm b/trunk/dist/game/data/html/teleporter/nobles_not.htm
similarity index 100%
rename from trunk/dist/game/data/html/teleporter/nobleteleport-no.htm
rename to trunk/dist/game/data/html/teleporter/nobles_not.htm
diff --git a/trunk/dist/game/data/html/teleporter/not_nobles.htm b/trunk/dist/game/data/html/teleporter/not_nobles.htm
deleted file mode 100644
index d00ef71d61..0000000000
--- a/trunk/dist/game/data/html/teleporter/not_nobles.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Only a Noblesse can use the Noblesse Only Teleport.
-
-
\ No newline at end of file
diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
index 308eab5b1c..a524479336 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
@@ -80,7 +80,7 @@ public final class L2TeleporterInstance extends L2Npc
case "showNoblesSelect":
{
final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
- msg.setFile(player.getHtmlPrefix(), "html/teleporter/" + (player.isNoble() ? "nobles_select" : "not_nobles") + ".htm");
+ msg.setFile(player.getHtmlPrefix(), "html/teleporter/" + (player.isNoble() ? "nobles_select" : "nobles_not") + ".htm");
msg.replace("%objectId%", getObjectId());
player.sendPacket(msg);
break;
@@ -544,7 +544,7 @@ public final class L2TeleporterInstance extends L2Npc
}
else if (list.getIsForNoble() && !player.isNoble())
{
- final String filename = "html/teleporter/nobleteleporter-no.htm";
+ final String filename = "html/teleporter/nobles_not.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.replace("%objectId%", String.valueOf(getObjectId()));