From d7d071860c07cd01d26aedb5fde3bb1961a92fdd Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 1 Oct 2020 21:45:54 +0000
Subject: [PATCH] Fixed castle teleporter waiting bypass. Contributed by
 Trance.

---
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 2 +-
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 2 +-
 .../ai/others/CastleTeleporter/CastleTeleporter-05.html       | 4 ++--
 .../scripts/ai/others/CastleTeleporter/CastleTeleporter.java  | 4 ++--
 30 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 2db6ea2d87..998541f12a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index e90512aaef..6695d44df2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..2003f7c37e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -3,6 +3,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.<br>
 Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..ec2cf52505 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
index 708e149490..998541f12a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html
@@ -1,8 +1,8 @@
 <html><body>
 That is not possible as the Guardian Towers of Life have been destroyed.<br>
-Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.<br>
+Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.<br>
 Make yourself comfortable.<br>
 <center>
-<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter teleporter-03.html">Teleport</Button>
+<Button ALIGN=LEFT ICON="TELEPORT" action="bypass -h Quest CastleTeleporter CastleTeleporter-06.html">Teleport</Button>
 </center>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 3cd8d45aa7..6695d44df2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
@@ -90,7 +90,7 @@ public class CastleTeleporter extends AbstractNpcAI
 				if (npc.isScriptValue(0))
 				{
 					final Siege siege = npc.getCastle().getSiege();
-					final int time = (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? 180000 : 30000;
+					final int time = (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? 480000 : 30000;
 					startQuestTimer("MASS_TELEPORT", time, npc, null);
 					npc.setScriptValue(1);
 				}
@@ -178,7 +178,7 @@ public class CastleTeleporter extends AbstractNpcAI
 		if (CommonUtil.contains(MASS_TELEPORTERS, npc.getId()))
 		{
 			final Siege siege = npc.getCastle().getSiege();
-			htmltext = (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
+			htmltext = npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "CastleTeleporter-05.html" : "CastleTeleporter-04.html" : "CastleTeleporter-06.html";
 		}
 		else if ((npc.getCastle().getOwnerId() == player.getClanId()) && (player.getClanId() != 0) && (player.getSiegeState() == 2)) // Deffender
 		{