diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index acaad0d9a6..cfe7ee4957 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -130,27 +130,24 @@ public class AdminZone implements IAdminCommandHandler
 		adminReply.replace("%SCRIPT%", activeChar.isInsideZone(ZoneId.SCRIPT) ? "<font color=\"LEVEL\">YES</font>" : "NO");
 		
 		final StringBuilder zones = new StringBuilder(100);
-		for (L2ZoneType zone : ZoneManager.getInstance().getRegion(activeChar).getZones().values())
+		for (L2ZoneType zone : ZoneManager.getInstance().getZones(activeChar))
 		{
-			if (zone.isCharacterInZone(activeChar))
+			if (zone.getName() != null)
 			{
-				if (zone.getName() != null)
-				{
-					zones.append(zone.getName());
-					zones.append("<br1>");
-					if (zone.getId() < 300000)
-					{
-						zones.append("(");
-						zones.append(zone.getId());
-						zones.append(")");
-					}
-				}
-				else
+				zones.append(zone.getName());
+				zones.append("<br1>");
+				if (zone.getId() < 300000)
 				{
+					zones.append("(");
 					zones.append(zone.getId());
+					zones.append(")");
 				}
-				zones.append(" ");
 			}
+			else
+			{
+				zones.append(zone.getId());
+			}
+			zones.append(" ");
 		}
 		for (L2SpawnTerritory territory : ZoneManager.getInstance().getSpawnTerritories(activeChar))
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index acaad0d9a6..cfe7ee4957 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -130,27 +130,24 @@ public class AdminZone implements IAdminCommandHandler
 		adminReply.replace("%SCRIPT%", activeChar.isInsideZone(ZoneId.SCRIPT) ? "<font color=\"LEVEL\">YES</font>" : "NO");
 		
 		final StringBuilder zones = new StringBuilder(100);
-		for (L2ZoneType zone : ZoneManager.getInstance().getRegion(activeChar).getZones().values())
+		for (L2ZoneType zone : ZoneManager.getInstance().getZones(activeChar))
 		{
-			if (zone.isCharacterInZone(activeChar))
+			if (zone.getName() != null)
 			{
-				if (zone.getName() != null)
-				{
-					zones.append(zone.getName());
-					zones.append("<br1>");
-					if (zone.getId() < 300000)
-					{
-						zones.append("(");
-						zones.append(zone.getId());
-						zones.append(")");
-					}
-				}
-				else
+				zones.append(zone.getName());
+				zones.append("<br1>");
+				if (zone.getId() < 300000)
 				{
+					zones.append("(");
 					zones.append(zone.getId());
+					zones.append(")");
 				}
-				zones.append(" ");
 			}
+			else
+			{
+				zones.append(zone.getId());
+			}
+			zones.append(" ");
 		}
 		for (L2SpawnTerritory territory : ZoneManager.getInstance().getSpawnTerritories(activeChar))
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index acaad0d9a6..cfe7ee4957 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -130,27 +130,24 @@ public class AdminZone implements IAdminCommandHandler
 		adminReply.replace("%SCRIPT%", activeChar.isInsideZone(ZoneId.SCRIPT) ? "<font color=\"LEVEL\">YES</font>" : "NO");
 		
 		final StringBuilder zones = new StringBuilder(100);
-		for (L2ZoneType zone : ZoneManager.getInstance().getRegion(activeChar).getZones().values())
+		for (L2ZoneType zone : ZoneManager.getInstance().getZones(activeChar))
 		{
-			if (zone.isCharacterInZone(activeChar))
+			if (zone.getName() != null)
 			{
-				if (zone.getName() != null)
-				{
-					zones.append(zone.getName());
-					zones.append("<br1>");
-					if (zone.getId() < 300000)
-					{
-						zones.append("(");
-						zones.append(zone.getId());
-						zones.append(")");
-					}
-				}
-				else
+				zones.append(zone.getName());
+				zones.append("<br1>");
+				if (zone.getId() < 300000)
 				{
+					zones.append("(");
 					zones.append(zone.getId());
+					zones.append(")");
 				}
-				zones.append(" ");
 			}
+			else
+			{
+				zones.append(zone.getId());
+			}
+			zones.append(" ");
 		}
 		for (L2SpawnTerritory territory : ZoneManager.getInstance().getSpawnTerritories(activeChar))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index acaad0d9a6..cfe7ee4957 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -130,27 +130,24 @@ public class AdminZone implements IAdminCommandHandler
 		adminReply.replace("%SCRIPT%", activeChar.isInsideZone(ZoneId.SCRIPT) ? "<font color=\"LEVEL\">YES</font>" : "NO");
 		
 		final StringBuilder zones = new StringBuilder(100);
-		for (L2ZoneType zone : ZoneManager.getInstance().getRegion(activeChar).getZones().values())
+		for (L2ZoneType zone : ZoneManager.getInstance().getZones(activeChar))
 		{
-			if (zone.isCharacterInZone(activeChar))
+			if (zone.getName() != null)
 			{
-				if (zone.getName() != null)
-				{
-					zones.append(zone.getName());
-					zones.append("<br1>");
-					if (zone.getId() < 300000)
-					{
-						zones.append("(");
-						zones.append(zone.getId());
-						zones.append(")");
-					}
-				}
-				else
+				zones.append(zone.getName());
+				zones.append("<br1>");
+				if (zone.getId() < 300000)
 				{
+					zones.append("(");
 					zones.append(zone.getId());
+					zones.append(")");
 				}
-				zones.append(" ");
 			}
+			else
+			{
+				zones.append(zone.getId());
+			}
+			zones.append(" ");
 		}
 		for (L2SpawnTerritory territory : ZoneManager.getInstance().getSpawnTerritories(activeChar))
 		{