diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java index 908b427..0dcee21 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java @@ -329,49 +329,47 @@ public class Listeners implements Listener { } if (player.hasPermission("advancedportals.createportal")) { - if (!plugin.getSettings().enabledWorldEditIntegration()) { - if (event.getItem() != null && event.getItem().getType() == WandMaterial // was type id - && (!UseOnlyServerAxe || (checkItemForName(event.getItem()) && event.getItem().getItemMeta() - .getDisplayName().equals("\u00A7ePortal Region Selector")))) { + if (!plugin.getSettings().enabledWorldEditIntegration() + && event.getItem() != null && event.getItem().getType() == WandMaterial // was type id + && (!UseOnlyServerAxe || (checkItemForName(event.getItem()) && event.getItem().getItemMeta() + .getDisplayName().equals("\u00A7ePortal Region Selector")))) { - // This checks if the action was a left or right click and if it was directly - // effecting a block. - if (event.getAction() == Action.LEFT_CLICK_BLOCK) { - Location blockloc = event.getClickedBlock().getLocation(); - // stores the selection as metadata on the character so then it isn't saved - // anywhere, if the player logs out it will - // have to be selected again if the player joins, also it does not affect any - // other players. - player.setMetadata("Pos1X", new FixedMetadataValue(plugin, blockloc.getBlockX())); - player.setMetadata("Pos1Y", new FixedMetadataValue(plugin, blockloc.getBlockY())); - player.setMetadata("Pos1Z", new FixedMetadataValue(plugin, blockloc.getBlockZ())); - player.setMetadata("Pos1World", new FixedMetadataValue(plugin, blockloc.getWorld().getName())); - player.sendMessage( - "\u00A7eYou have selected pos1! X:" + blockloc.getBlockX() + " Y:" + blockloc.getBlockY() - + " Z:" + blockloc.getBlockZ() + " World: " + blockloc.getWorld().getName()); + // This checks if the action was a left or right click and if it was directly + // effecting a block. + if (event.getAction() == Action.LEFT_CLICK_BLOCK) { + Location blockloc = event.getClickedBlock().getLocation(); + // stores the selection as metadata on the character so then it isn't saved + // anywhere, if the player logs out it will + // have to be selected again if the player joins, also it does not affect any + // other players. + player.setMetadata("Pos1X", new FixedMetadataValue(plugin, blockloc.getBlockX())); + player.setMetadata("Pos1Y", new FixedMetadataValue(plugin, blockloc.getBlockY())); + player.setMetadata("Pos1Z", new FixedMetadataValue(plugin, blockloc.getBlockZ())); + player.setMetadata("Pos1World", new FixedMetadataValue(plugin, blockloc.getWorld().getName())); + player.sendMessage( + "\u00A7eYou have selected pos1! X:" + blockloc.getBlockX() + " Y:" + blockloc.getBlockY() + + " Z:" + blockloc.getBlockZ() + " World: " + blockloc.getWorld().getName()); - // Stops the event so the block is not damaged - event.setCancelled(true); + // Stops the event so the block is not damaged + event.setCancelled(true); - // Returns the event so no more code is executed(stops unnecessary code being - // executed) - } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { - Location blockloc = event.getClickedBlock().getLocation(); - player.setMetadata("Pos2X", new FixedMetadataValue(plugin, blockloc.getBlockX())); - player.setMetadata("Pos2Y", new FixedMetadataValue(plugin, blockloc.getBlockY())); - player.setMetadata("Pos2Z", new FixedMetadataValue(plugin, blockloc.getBlockZ())); - player.setMetadata("Pos2World", new FixedMetadataValue(plugin, blockloc.getWorld().getName())); - player.sendMessage( - "\u00A7eYou have selected pos2! X:" + blockloc.getBlockX() + " Y:" + blockloc.getBlockY() - + " Z:" + blockloc.getBlockZ() + " World: " + blockloc.getWorld().getName()); + // Returns the event so no more code is executed(stops unnecessary code being + // executed) + } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { + Location blockloc = event.getClickedBlock().getLocation(); + player.setMetadata("Pos2X", new FixedMetadataValue(plugin, blockloc.getBlockX())); + player.setMetadata("Pos2Y", new FixedMetadataValue(plugin, blockloc.getBlockY())); + player.setMetadata("Pos2Z", new FixedMetadataValue(plugin, blockloc.getBlockZ())); + player.setMetadata("Pos2World", new FixedMetadataValue(plugin, blockloc.getWorld().getName())); + player.sendMessage( + "\u00A7eYou have selected pos2! X:" + blockloc.getBlockX() + " Y:" + blockloc.getBlockY() + + " Z:" + blockloc.getBlockZ() + " World: " + blockloc.getWorld().getName()); - // Stops the event so the block is not interacted with - event.setCancelled(true); - - // Returns the event so no more code is executed(stops unnecessary code being - // executed) - } + // Stops the event so the block is not interacted with + event.setCancelled(true); + // Returns the event so no more code is executed(stops unnecessary code being + // executed) } } else if (checkItemForName(event.getItem()) && event.getItem().getItemMeta().getDisplayName().equals("\u00A75Portal Block Placer")