From 15d4b6d34b3c47830571a091318d16643e700d04 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 29 Dec 2016 07:23:51 +1100 Subject: [PATCH] Bump spigot version --- Bukkit/build.gradle | 2 +- .../plot/commands/Auto.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 0ee1e63ab..b372f9044 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { compile project(':Core') - compile 'org.spigotmc:spigot-api:1.11-R0.1-SNAPSHOT' + compile 'org.spigotmc:spigot-api:1.11.2-R0.1-SNAPSHOT' compile("net.milkbowl.vault:VaultAPI:1.6") { exclude module: 'bukkit' } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java index 5875bb8e7..75de9ef50 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java @@ -117,6 +117,16 @@ public class Auto extends SubCommand { return false; } } + if (schematic != null && !schematic.isEmpty()) { + if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) { + sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic); + return true; + } + if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic)) && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) { + MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic)); + return true; + } + } if (EconHandler.manager != null && plotarea.USE_ECONOMY) { Expression costExp = plotarea.PRICES.get("claim"); double cost = costExp.evaluate((double) currentPlots); @@ -130,16 +140,6 @@ public class Auto extends SubCommand { sendMessage(player, C.REMOVED_BALANCE, cost + ""); } } - if (schematic != null && !schematic.isEmpty()) { - if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) { - sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic); - return true; - } - if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic)) && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) { - MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic)); - return true; - } - } // TODO handle type 2 the same as normal worlds! if (plotarea.TYPE == 2) { PlotId bot = plotarea.getMin();