Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-07 19:40:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.9' into release

Browse Source
This commit is contained in:
KHobbits 2012-08-08 23:13:33 +01:00
commit 86749c433c
9 changed files with 102 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Essentials/src/com/earth2me/essentials/Util.java
View File

@ -285,6 +285,45 @@ public class Util
}
return block.getLocation();
}
public final static int RADIUS = 3;
public final static Vector3D[] VOLUME;
public static class Vector3D
{
public Vector3D(int x, int y, int z)
{
this.x = x;
this.y = y;
this.z = z;
}
public int x;
public int y;
public int z;
}
static
{
List<Vector3D> pos = new ArrayList<Vector3D>();
for (int x = -RADIUS; x <= RADIUS; x++)
{
for (int y = -RADIUS; y <= RADIUS; y++)
{
for (int z = -RADIUS; z <= RADIUS; z++)
{
pos.add(new Vector3D(x, y, z));
}
}
}
Collections.sort(pos, new Comparator<Vector3D>()
{
@Override
public int compare(Vector3D a, Vector3D b)
{
return (a.x * a.x + a.y * a.y + a.z * a.z) - (b.x * b.x + b.y * b.y + b.z * b.z);
}
});
VOLUME = pos.toArray(new Vector3D[0]);
}
public static Location getSafeDestination(final Location loc) throws Exception
{
@ -296,7 +335,9 @@ public class Util
int x = loc.getBlockX();
int y = (int)Math.round(loc.getY());
int z = loc.getBlockZ();
final int origX = x;
final int origY = y;
final int origZ = z;
while (isBlockAboveAir(world, x, y, z))
{
@ -308,38 +349,29 @@ public class Util
}
}
int i = 0;
while (isBlockUnsafe(world, x, y, z))
{
y += 1;
if (y >= world.getHighestBlockYAt(x, z))
i++;
if (i >= VOLUME.length)
{
x -= 3;
z -= 3;
y = origY + 4;
x = origX;
y = origY + RADIUS;
z = origZ;
break;
}
x = origX + VOLUME[i].x;
y = origY + VOLUME[i].y;
z = origZ + VOLUME[i].z;
}
while (isBlockUnsafe(world, x, y, z))
{
y -= 1;
if (y + 4 < origY)
y += 1;
if (y >= world.getMaxHeight())
{
x += 1;
if (x - 3 > loc.getBlockX())
{
x = loc.getBlockX() - 3;
z += 1;
if (z - 3 > loc.getBlockZ())
{
x = loc.getBlockX() + 4;
z = loc.getBlockZ();
y = world.getHighestBlockYAt(x, z);
break;
}
}
y = origY + 4;
break;
}
}
@ -377,6 +409,11 @@ public class Util
return true;
}
if (below.getType() == Material.BED_BLOCK)
{
return true;
}
if ((!AIR_MATERIALS.contains(world.getBlockAt(x, y, z).getType().getId()))
|| (!AIR_MATERIALS.contains(world.getBlockAt(x, y + 1, z).getType().getId())))
{

4
Essentials/src/com/earth2me/essentials/commands/Commandtop.java
View File

@ -20,8 +20,8 @@ public class Commandtop extends EssentialsCommand
{
final int topX = user.getLocation().getBlockX();
final int topZ = user.getLocation().getBlockZ();
final int topY = user.getWorld().getHighestBlockYAt(topX, topZ);
user.getTeleport().teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ()), new Trade(this.getName(), ess), TeleportCause.COMMAND);
final Location location = new Location(user.getWorld(), topX, user.getWorld().getMaxHeight(), topZ);
user.getTeleport().teleport(location, new Trade(this.getName(), ess), TeleportCause.COMMAND);
user.sendMessage(_("teleportTop"));
}
}

2
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View File

@ -58,7 +58,7 @@ public class Commandtp extends EssentialsCommand
throw new Exception(_("teleportDisabled", toPlayer.getDisplayName()));
}
if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !target.isAuthorized("essentials.world." + toPlayer.getWorld().getName()))
&& !user.isAuthorized("essentials.world." + toPlayer.getWorld().getName()))
{
throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName()));
}

2
Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
View File

@ -26,7 +26,7 @@ public class Commandtpahere extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName()));
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !player.isAuthorized("essentials.world." + user.getWorld().getName()))
&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
{
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
}

2
Essentials/src/com/earth2me/essentials/commands/Commandtpall.java
View File

@ -43,7 +43,7 @@ public class Commandtpall extends EssentialsCommand
continue;
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !player.isAuthorized("essentials.world." + user.getWorld().getName()))
&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
{
continue;
}

2
Essentials/src/com/earth2me/essentials/commands/Commandtphere.java
View File

@ -23,7 +23,7 @@ public class Commandtphere extends EssentialsCommand
throw new Exception(_("teleportDisabled", player.getDisplayName()));
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !player.isAuthorized("essentials.world." + user.getWorld().getName()))
&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
{
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
}

2
Essentials/src/com/earth2me/essentials/commands/Commandtpohere.java
View File

@ -31,7 +31,7 @@ public class Commandtpohere extends EssentialsCommand
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !player.isAuthorized("essentials.world." + user.getWorld().getName()))
&& !user.isAuthorized("essentials.world." + user.getWorld().getName()))
{
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
}

11
Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
View File

@ -20,14 +20,19 @@ public class SignPlayerListener implements Listener
this.ess = ess;
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@EventHandler(priority = EventPriority.LOW)
public void onPlayerInteract(final PlayerInteractEvent event)
{
if (ess.getSettings().areSignsDisabled() || event.getAction() != Action.RIGHT_CLICK_BLOCK)
if (ess.getSettings().areSignsDisabled() || (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR))
{
return;
}
final Block block = event.getClickedBlock();
final Block block;
if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) {
block = event.getPlayer().getTargetBlock(null, 5);
} else {
block = event.getClickedBlock();
}
if (block == null)
{
return;

29
Essentials/test/com/earth2me/essentials/UtilTest.java
View File

@ -3,6 +3,8 @@ package com.earth2me.essentials;
import java.io.IOException;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
import org.bukkit.World.Environment;
import org.bukkit.plugin.InvalidDescriptionException;
@ -32,6 +34,33 @@ public class UtilTest extends TestCase
}
}
public void testSafeLocation()
{
Set<String> testSet = new HashSet<String>();
int count = 0;
int x, y, z, origX, origY, origZ;
x = y = z = origX = origY = origZ = 0;
int i = 0;
while (true)
{
testSet.add(x + ":" + y + ":" + z);
count++;
i++;
if (i >= Util.VOLUME.length)
{
break;
}
x = origX + Util.VOLUME[i].x;
y = origY + Util.VOLUME[i].y;
z = origZ + Util.VOLUME[i].z;
}
assertTrue(testSet.contains("0:0:0"));
assertTrue(testSet.contains("3:3:3"));
assertEquals(testSet.size(), count);
int diameter = Util.RADIUS * 2 + 1;
assertEquals(diameter * diameter * diameter, count);
}
public void testFDDnow()
{
Calendar c = new GregorianCalendar();