TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-03 23:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Try to do a little better when searching for safe teleport locations.

Browse source
This commit is contained in:
KHobbits 2012-07-17 00:46:07 +01:00
parent ada077fead
commit 66ae1d5b94
1 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Essentials/src/com/earth2me/essentials/Util.java
View file

@ -215,10 +215,11 @@ public class Util
{ {
c.add(Calendar.SECOND, seconds * (future ? 1 : -1)); c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
} }
Calendar max = new GregorianCalendar(); Calendar max = new GregorianCalendar();
max.add(Calendar.YEAR, 10); max.add(Calendar.YEAR, 10);
if (c.after(max)) { if (c.after(max))
{
return max.getTimeInMillis(); return max.getTimeInMillis();
} }
return c.getTimeInMillis(); return c.getTimeInMillis();
@ -295,12 +296,14 @@ public class Util
int x = loc.getBlockX(); int x = loc.getBlockX();
int y = (int)Math.round(loc.getY()); int y = (int)Math.round(loc.getY());
int z = loc.getBlockZ(); int z = loc.getBlockZ();
final int oy = y;
while (isBlockAboveAir(world, x, y, z)) while (isBlockAboveAir(world, x, y, z))
{ {
y -= 1; y -= 1;
if (y < 0) if (y < 0)
{ {
y = oy;
break; break;
} }
} }
@ -310,10 +313,38 @@ public class Util
y += 1; y += 1;
if (y >= world.getHighestBlockYAt(x, z)) if (y >= world.getHighestBlockYAt(x, z))
{ {
x += 1; x -= 3;
z -= 3;
y = oy + 4;
break; break;
} }
} }
while (isBlockUnsafe(world, x, y, z))
{
y -= 1;
if (y + 4 < oy)
{
System.out.println("Lets inc x");
x += 1;
y = oy + 4;
if (x - 3 > loc.getBlockX())
{
System.out.println("Lets inc z");
x = loc.getBlockX() - 3;
z += 1;
if (z - 3 > loc.getBlockZ())
{
System.out.println("Time to give up");
x = loc.getBlockX() + 4;
z = loc.getBlockZ();
y = world.getHighestBlockYAt(x, z);
break;
}
}
}
}
while (isBlockUnsafe(world, x, y, z)) while (isBlockUnsafe(world, x, y, z))
{ {
y -= 1; y -= 1;
@ -321,7 +352,7 @@ public class Util
{ {
x += 1; x += 1;
y = world.getHighestBlockYAt(x, z); y = world.getHighestBlockYAt(x, z);
if (x - 32 > loc.getBlockX()) if (x - 48 > loc.getBlockX())
{ {
throw new Exception(_("holeInFloor")); throw new Exception(_("holeInFloor"));
} }
@ -510,15 +541,16 @@ public class Util
} }
return buf.toString(); return buf.toString();
} }
public static String lastCode(final String input) { public static String lastCode(final String input)
{
int pos = input.lastIndexOf("§"); int pos = input.lastIndexOf("§");
if (pos == -1 || (pos + 1) == input.length()) { if (pos == -1 || (pos + 1) == input.length())
{
return ""; return "";
} }
return input.substring(pos, pos + 2); return input.substring(pos, pos + 2);
} }
private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)"); private static transient final Pattern URL_PATTERN = Pattern.compile("((?:(?:https?)://)?[\\w-_\\.]{2,})\\.([a-z]{2,3}(?:/\\S+)?)");
private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]"); private static transient final Pattern VANILLA_PATTERN = Pattern.compile("\u00A7+[0-9A-FK-ORa-fk-or]");
private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])"); private static transient final Pattern REPLACE_PATTERN = Pattern.compile("&([0-9a-fk-or])");