From dce25ba07a1d68e4e8930a013874b7639be8d6fc Mon Sep 17 00:00:00 2001 From: boy0001 Date: Mon, 27 Jul 2015 19:14:28 +1000 Subject: [PATCH] Fix errors *again --- .../java/com/intellectualcrafters/plot/commands/Add.java | 2 +- .../com/intellectualcrafters/plot/commands/Cluster.java | 6 +++--- .../intellectualcrafters/plot/commands/DebugClaimTest.java | 2 +- .../com/intellectualcrafters/plot/commands/DebugExec.java | 2 +- .../java/com/intellectualcrafters/plot/commands/Deny.java | 2 +- .../java/com/intellectualcrafters/plot/commands/Purge.java | 4 ++-- .../java/com/intellectualcrafters/plot/commands/Remove.java | 2 +- .../com/intellectualcrafters/plot/commands/SetOwner.java | 2 +- .../java/com/intellectualcrafters/plot/commands/Trust.java | 2 +- .../java/com/intellectualcrafters/plot/commands/Undeny.java | 2 +- .../com/intellectualcrafters/plot/commands/Untrust.java | 2 +- .../java/com/intellectualcrafters/plot/commands/Visit.java | 2 +- .../java/com/intellectualcrafters/plot/commands/list.java | 2 +- .../bukkit/database/plotme/ClassicPlotMeConnector.java | 6 +++--- .../bukkit/database/plotme/PlotMeConnector_017.java | 2 +- src/main/java/com/plotsquared/sponge/SpongeMain.java | 3 ++- 16 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/src/main/java/com/intellectualcrafters/plot/commands/Add.java index 76e2cf790..9eb98a6d7 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Add.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Add.java @@ -74,7 +74,7 @@ public class Add extends SubCommand { if (args[0].equalsIgnoreCase("*")) { uuid = DBFunc.everyone; } else { - uuid = UUIDHandler.getUUID(args[0]); + uuid = UUIDHandler.getUUID(args[0], null); } if (uuid == null) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java index b71f2722f..ed9ecdc20 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java @@ -332,7 +332,7 @@ public class Cluster extends SubCommand { } } // check uuid - final UUID uuid = UUIDHandler.getUUID(args[1]); + final UUID uuid = UUIDHandler.getUUID(args[1], null); if (uuid == null) { MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]); return false; @@ -373,7 +373,7 @@ public class Cluster extends SubCommand { } } // check uuid - final UUID uuid = UUIDHandler.getUUID(args[1]); + final UUID uuid = UUIDHandler.getUUID(args[1], null); if (uuid == null) { MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]); return false; @@ -468,7 +468,7 @@ public class Cluster extends SubCommand { MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER); return false; } - final UUID uuid = UUIDHandler.getUUID(args[2]); + final UUID uuid = UUIDHandler.getUUID(args[2], null); if (uuid == null) { MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]); return false; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java index c26db1ca4..43dc7f3a0 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java @@ -121,7 +121,7 @@ public class DebugClaimTest extends SubCommand { } } if (uuid == null) { - uuid = UUIDHandler.getUUID(line); + uuid = UUIDHandler.getUUID(line, null); } if (uuid != null) { MainUtil.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java index 08a541d37..a49c6cc6c 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java @@ -221,7 +221,7 @@ public class DebugExec extends SubCommand { if (args.length != 2) { return MainUtil.sendMessage(player, "Use /plot debugexec seen "); } - final UUID uuid = UUIDHandler.getUUID(args[1]); + final UUID uuid = UUIDHandler.getUUID(args[1], null); if (uuid == null) { return MainUtil.sendMessage(player, "player not found: " + args[1]); } diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java index 90e2fe1f1..3448a180c 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java @@ -73,7 +73,7 @@ public class Deny extends SubCommand { if (args[0].equalsIgnoreCase("*")) { uuid = DBFunc.everyone; } else { - uuid = UUIDHandler.getUUID(args[0]); + uuid = UUIDHandler.getUUID(args[0], null); } if (uuid == null) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java index 92f2494cf..736eda58f 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java @@ -63,7 +63,7 @@ public class Purge extends SubCommand { caller.message("/plot purxe x;z &l"); return false; } - final UUID uuid = UUIDHandler.getUUID(args[0]); + final UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { caller.message("/plot purge " + args[0] + " &l"); return false; @@ -149,7 +149,7 @@ public class Purge extends SubCommand { DBFunc.purge(worldname, ids); return finishPurge(length); } - final UUID uuid = UUIDHandler.getUUID(args[0]); + final UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { final Set plots = PS.get().getPlots(worldname, uuid); final Set ids = new HashSet<>(); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java index 041e22d3d..e7b175381 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java @@ -112,7 +112,7 @@ public class Remove extends SubCommand { break; } default: - UUID uuid = UUIDHandler.getUUID(args[0]); + UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { if (plot.getTrusted().contains(uuid)) { if (plot.removeTrusted(uuid)) { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java index 2759c87c0..5d3959798 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java @@ -56,7 +56,7 @@ public class SetOwner extends SubCommand { } private UUID getUUID(final String string) { - return UUIDHandler.getUUID(string); + return UUIDHandler.getUUID(string, null); } @Override diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java index 6fb3247a4..942cb7175 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java @@ -73,7 +73,7 @@ public class Trust extends SubCommand { if (args[0].equalsIgnoreCase("*")) { uuid = DBFunc.everyone; } else { - uuid = UUIDHandler.getUUID(args[0]); + uuid = UUIDHandler.getUUID(args[0], null); } if (uuid == null) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java index fd87d5c17..aab2e4a49 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java @@ -88,7 +88,7 @@ public class Undeny extends SubCommand { } break; default: - UUID uuid = UUIDHandler.getUUID(args[0]); + UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { if (plot.removeDenied(uuid)) { count++; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java index 0f9c3471d..e22597b61 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java @@ -90,7 +90,7 @@ public class Untrust extends SubCommand { } break; default: - UUID uuid = UUIDHandler.getUUID(args[0]); + UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { if (plot.removeTrusted(uuid)) { count++; diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java index e53da4d46..355487065 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java @@ -66,7 +66,7 @@ public class Visit extends SubCommand { public boolean onCommand(CommandCaller caller, String[] args) { PlotPlayer plr = (PlotPlayer) caller.getSuperCaller(); ArrayList plots = new ArrayList<>(); - UUID user = UUIDHandler.getUUID(args[0]); + UUID user = UUIDHandler.getUUID(args[0], null); if (user != null ) { // do plots by username plots.addAll(PS.get().getPlots(user)); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java index 41a2598c6..f4283b575 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/list.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java @@ -301,7 +301,7 @@ public class list extends SubCommand { plots = new ArrayList<>(PS.get().getPlots(args[0]).values()); break; } - UUID uuid = UUIDHandler.getUUID(args[0]); + UUID uuid = UUIDHandler.getUUID(args[0], null); if (uuid != null) { if (!Permissions.hasPermission(plr, "plots.list.player")) { MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player"); diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java index 65fbf6948..333fbbc89 100644 --- a/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java @@ -92,7 +92,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector { setMerged(merges, world, id, 0); } } - UUID owner = UUIDHandler.getUUID(name); + UUID owner = UUIDHandler.getUUID(name, null); if (owner == null) { if (name.equals("*")) { owner = DBFunc.everyone; @@ -149,7 +149,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector { final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ")); final String name = r.getString("player"); final String world = LikePlotMeConverter.getWorld(r.getString("world")); - UUID denied = UUIDHandler.getUUID(name); + UUID denied = UUIDHandler.getUUID(name, null); if (denied == null) { if (name.equals("*")) { denied = DBFunc.everyone; @@ -170,7 +170,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector { final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ")); final String name = r.getString("player"); final String world = LikePlotMeConverter.getWorld(r.getString("world")); - UUID helper = UUIDHandler.getUUID(name); + UUID helper = UUIDHandler.getUUID(name, null); if (helper == null) { if (name.equals("*")) { helper = DBFunc.everyone; diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java index b6c0744d9..3d0978664 100644 --- a/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java +++ b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java @@ -94,7 +94,7 @@ public class PlotMeConnector_017 extends APlotMeConnector { setMerged(merges, world, id, 0); } } - UUID owner = UUIDHandler.getUUID(name); + UUID owner = UUIDHandler.getUUID(name, null); if (owner == null) { if (name.equals("*")) { owner = DBFunc.everyone; diff --git a/src/main/java/com/plotsquared/sponge/SpongeMain.java b/src/main/java/com/plotsquared/sponge/SpongeMain.java index 398b1a758..be368174f 100644 --- a/src/main/java/com/plotsquared/sponge/SpongeMain.java +++ b/src/main/java/com/plotsquared/sponge/SpongeMain.java @@ -36,6 +36,7 @@ import com.intellectualcrafters.plot.util.InventoryUtil; import com.intellectualcrafters.plot.util.PlayerManager; import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.UUIDHandler; +import com.intellectualcrafters.plot.util.UUIDHandlerImplementation; import com.intellectualcrafters.plot.uuid.UUIDWrapper; import com.plotsquared.bukkit.listeners.APlotListener; import com.plotsquared.bukkit.util.SetupUtils; @@ -279,7 +280,7 @@ public class SpongeMain implements IPlotMain, PluginContainer { } @Override - public UUIDWrapper initUUIDHandler() { + public UUIDHandlerImplementation initUUIDHandler() { // TODO Auto-generated method stub return null; }