From e4d7270c2836a67112e1df0d823cfe49cb521b04 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 30 Sep 2016 03:30:34 +1000 Subject: [PATCH] Fix some merged plot events --- .../bukkit/listeners/PlayerEvents.java | 24 +++++++++---------- .../intellectualcrafters/plot/config/C.java | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index 729c92cc1..629b082e9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -315,7 +315,7 @@ public class PlayerEvents extends PlotListener implements Listener { if (area == null) { return true; } - Plot plot = area.getPlotAbs(loc); + Plot plot = area.getPlot(loc); ProjectileSource shooter = entity.getShooter(); if (shooter instanceof Player) { PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter); @@ -647,7 +647,7 @@ public class PlayerEvents extends PlotListener implements Listener { if (area == null) { return; } - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot != null) { PlotPlayer plotPlayer = BukkitUtil.getPlayer(player); if (event.getBlock().getY() == 0) { @@ -869,7 +869,7 @@ public class PlayerEvents extends PlotListener implements Listener { if (area == null) { return; } - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot != null) { if (location.getY() == 0) { event.setCancelled(true); @@ -1129,7 +1129,7 @@ public class PlayerEvents extends PlotListener implements Listener { } } } - Plot origin = area.getPlotAbs(location); + Plot origin = area.getPlot(location); if (origin == null) { event.setCancelled(true); return; @@ -1728,7 +1728,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer()); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot == null) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { return; @@ -1799,7 +1799,7 @@ public class PlayerEvents extends PlotListener implements Listener { } Player player = event.getPlayer(); PlotPlayer plotPlayer = BukkitUtil.getPlayer(player); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot == null) { if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) { return; @@ -1854,7 +1854,7 @@ public class PlayerEvents extends PlotListener implements Listener { } Player p = event.getPlayer(); PlotPlayer pp = BukkitUtil.getPlayer(p); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot == null) { if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD); @@ -1895,7 +1895,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } PlotPlayer pp = BukkitUtil.getPlayer(p); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot == null) { if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD); @@ -1925,7 +1925,7 @@ public class PlayerEvents extends PlotListener implements Listener { return; } PlotPlayer player = BukkitUtil.getPlayer(shooter); - Plot plot = area.getPlotAbs(BukkitUtil.getLocation(event.getEntity())); + Plot plot = area.getPlot(BukkitUtil.getLocation(event.getEntity())); if (plot != null) { if (!plot.hasOwner()) { if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) { @@ -1956,7 +1956,7 @@ public class PlayerEvents extends PlotListener implements Listener { } Player p = event.getPlayer(); PlotPlayer pp = BukkitUtil.getPlayer(p); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot == null) { if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD); @@ -2005,7 +2005,7 @@ public class PlayerEvents extends PlotListener implements Listener { if (d instanceof Player) { Player p = (Player) d; PlotPlayer pp = BukkitUtil.getPlayer(p); - Plot plot = area.getPlotAbs(l); + Plot plot = area.getPlot(l); if (plot == null) { if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) { MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road"); @@ -2256,7 +2256,7 @@ public class PlayerEvents extends PlotListener implements Listener { } Player player = event.getPlayer(); PlotPlayer pp = BukkitUtil.getPlayer(player); - Plot plot = area.getPlotAbs(location); + Plot plot = area.getPlot(location); if (plot != null) { if (!plot.hasOwner()) { if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java index 4f83fa9c8..93432f633 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java @@ -344,7 +344,7 @@ public enum C { "$4You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or " + "your chosen world management plugin.", "Setup"), - SETUP_WORLD_TAKEN("$2%s is already a registered plotworld", "Setup"), + SETUP_WORLD_TAKEN("$2%s is already a world", "Setup"), SETUP_MISSING_WORLD( "$2You need to specify a world name ($1/plot setup &l$1 $2)&-$1Additional commands:&-$2 - $1/plot setup &-$2 -" + " $1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),