From c36ef1d237ce53a062b08090887eb7cad84cf919 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 10 Aug 2017 16:35:53 +1000 Subject: [PATCH] Fixes #1673 + unrelated plotme conversion fix --- .../bukkit/database/plotme/PlotMeConnector_017.java | 6 ++++-- .../com/intellectualcrafters/plot/commands/DebugExec.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java index 944e02f36..9567ebb8f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java @@ -147,7 +147,8 @@ public class PlotMeConnector_017 extends APlotMeConnector { PS.log("&6Denied (" + key + ") references deleted plot; ignoring entry."); continue; } - UUID denied = UUID.fromString(resultSet.getString("player")); + String player = resultSet.getString("player"); + UUID denied = player.equals("*") ? DBFunc.everyone : UUID.fromString(player); plot.getDenied().add(denied); } @@ -162,7 +163,8 @@ public class PlotMeConnector_017 extends APlotMeConnector { PS.log("&6Allowed (" + key + ") references deleted plot; ignoring entry."); continue; } - UUID allowed = UUID.fromString(resultSet.getString("player")); + String player = resultSet.getString("player"); + UUID allowed = player.equals("*") ? DBFunc.everyone : UUID.fromString(player); plot.getTrusted().add(allowed); } resultSet.close(); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index 2ab320944..ae92e986b 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -151,7 +151,7 @@ public class DebugExec extends SubCommand { @Override public boolean onCommand(final PlotPlayer player, String[] args) { List allowed_params = - Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "show-expired", "seen", "list-scripts"); + Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "seen", "list-scripts"); if (args.length > 0) { String arg = args[0].toLowerCase(); String script;