From 7eeea0f10fe75bf220606a3c9977c368143f5cf4 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Tue, 14 Jul 2015 20:55:38 +1000 Subject: [PATCH] Fixed player conversion for PlotMe 0.17 --- .../database/plotme/PlotMeConnector_017.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java index 4765624b9..c192fd5f7 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/PlotMeConnector_017.java @@ -149,16 +149,7 @@ public class PlotMeConnector_017 extends APlotMeConnector { MainUtil.sendConsoleMessage("&6Denied (" + key + ") references deleted plot; ignoring entry."); continue; } - String name = r.getString("player"); - UUID denied = UUIDHandler.getUUID(name); - if (denied == null) { - if (name.equals("*")) { - denied = DBFunc.everyone; - } else { - MainUtil.sendConsoleMessage("&6Denied (" + key + ") references incorrect name (`" + name + "`)"); - continue; - } - } + UUID denied = UUID.fromString(r.getString("player")); plot.denied.add(denied); } @@ -173,16 +164,7 @@ public class PlotMeConnector_017 extends APlotMeConnector { MainUtil.sendConsoleMessage("&6Allowed (" + key + ") references deleted plot; ignoring entry."); continue; } - String name = r.getString("player"); - UUID allowed = UUIDHandler.getUUID(name); - if (allowed == null) { - if (name.equals("*")) { - allowed = DBFunc.everyone; - } else { - MainUtil.sendConsoleMessage("&6Allowed (" + key + ") references incorrect name (`" + name + "`)"); - continue; - } - } + UUID allowed = UUID.fromString(r.getString("player")); plot.trusted.add(allowed); } r.close();