Skip to content

Commit

Permalink
Aah, copy-paste-error
Browse files Browse the repository at this point in the history
  • Loading branch information
rlf committed Dec 12, 2014
1 parent e9ec9c5 commit 17c4b56
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/main/java/us/talabrek/ultimateskyblock/uSkyBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,7 @@ public boolean playerIsOnIsland(final Player player) {
}

public boolean locationIsOnIsland(final Player player, final Location loc) {
// TODO: 12/12/2014 - R4zorax: Is equals correctly implemented?
if (!loc.getWorld().equals(skyBlockWorld)) {
if (!isSkyWorld(player.getWorld())) {
return false;
}
if (this.getActivePlayers().containsKey(player.getName())) {
Expand All @@ -821,7 +820,7 @@ public boolean locationIsOnIsland(final Player player, final Location loc) {
int r = Settings.island_radius;
CuboidRegion region = new CuboidRegion(
new Vector(p.getBlockX()-r, 0, p.getBlockZ()-r),
new Vector(p.getBlockX()-r, 0, p.getBlockZ()-r)
new Vector(p.getBlockX()+r, 255, p.getBlockZ()+r)
);
return region.contains(new Vector(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
}
Expand Down

0 comments on commit 17c4b56

Please sign in to comment.