From 9046d15fd408813737498631c64637b2f08de324 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 1 Sep 2022 04:52:31 +0000
Subject: [PATCH] TeleportZone onEnter with enabled parameter check.
 Contributed by Index.

---
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 .../l2jmobius/gameserver/model/zone/type/TeleportZone.java   | 5 ++++-
 24 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
index 3c72619a82..535aabfa2d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/TeleportZone.java
@@ -64,7 +64,10 @@ public class TeleportZone extends ZoneType
 	@Override
 	protected void onEnter(Creature creature)
 	{
-		creature.teleToLocation(new Location(_x, _y, _z));
+		if (isEnabled())
+		{
+			creature.teleToLocation(new Location(_x, _y, _z));
+		}
 	}
 	
 	@Override