Changed getRandomPoint calculation for ZoneCylinder.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java

@@ -138,11 +138,19 @@ public class ZoneCylinder extends ZoneForm
 	@Override
 	public Location getRandomPoint()
 	{
-		final int q = (int) (Rnd.nextDouble() * 2 * Math.PI);
+		int x = 0;
-		final int r = (int) Math.sqrt(Rnd.nextDouble());
+		int y = 0;
-		final int x = (int) ((_rad * r * Math.cos(q)) + _x);
+		final int x2 = _x - _rad;
-		final int y = (int) ((_rad * r * Math.sin(q)) + _y);
+		final int y2 = _y - _rad;
+		final int x3 = _x + _rad;
+		final int y3 = _y + _rad;
+		final int z = (_z1 + _z2) / 2;
+		while ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)
+		{
+			x = Rnd.get(x2, x3);
+			y = Rnd.get(y2, y3);
+		}
 		
-		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, (_z1 + _z2) / 2));
+		return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, z));
 	}
 }