From 10079579f2695b5bb479234539e4619c7d7d7347 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Wed, 8 Oct 2014 16:09:28 +1100 Subject: [PATCH] whoops, forgot I was in the middle of something. --- .../plot/database/PlotMeConverter.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java index 816d97b0e..37c4cc8e5 100644 --- a/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java +++ b/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java @@ -93,10 +93,8 @@ public class PlotMeConverter { if (user.equals("*")) { psAdded.add(DBFunc.everyone); } else { - UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + user).getBytes(Charsets.UTF_8)); - - psAdded.add(uuidMap.get(user)); + psAdded.add(uuid); } } try { @@ -104,7 +102,8 @@ public class PlotMeConverter { if (user.equals("*")) { psDenied.add(DBFunc.everyone); } else { - psDenied.add(uuidMap.get(user)); + UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + user).getBytes(Charsets.UTF_8)); + psDenied.add(uuid); } } } catch (Throwable e) { @@ -124,9 +123,7 @@ public class PlotMeConverter { pl = new com.intellectualcrafters.plot.Plot(id, plot.getOwnerId(), plot.getBiome(), psAdded, psTrusted, psDenied, false, 8000l, false, "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] { false, false, false, false }); } else { String owner = plot.getOwner(); - if (uuidMap.containsKey(owner)) { - pl = new com.intellectualcrafters.plot.Plot(id, uuidMap.get(owner), plot.getBiome(), psAdded, psTrusted, psDenied, false, 8000l, false, "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] { false, false, false, false }); - } + pl = new com.intellectualcrafters.plot.Plot(id, UUID.nameUUIDFromBytes(("OfflinePlayer:" + owner).getBytes(Charsets.UTF_8)), plot.getBiome(), psAdded, psTrusted, psDenied, false, 8000l, false, "", PlotHomePosition.DEFAULT, null, world.getName(), new boolean[] { false, false, false, false }); } // TODO createPlot doesn't add helpers / denied