EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix errors *again

Browse Source
This commit is contained in:
boy0001 2015-07-27 19:14:28 +10:00
parent 58ebf9d232
commit dce25ba07a
16 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/commands/Add.java
View File

@ -74,7 +74,7 @@ public class Add extends SubCommand {
if (args[0].equalsIgnoreCase("*")) { if (args[0].equalsIgnoreCase("*")) {
uuid = DBFunc.everyone; uuid = DBFunc.everyone;
} else { } else {
uuid = UUIDHandler.getUUID(args[0]); uuid = UUIDHandler.getUUID(args[0], null);
} }
if (uuid == null) { if (uuid == null) {
if (UUIDHandler.implementation instanceof SQLUUIDHandler) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) {

6
src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -332,7 +332,7 @@ public class Cluster extends SubCommand {
} }
} }
// check uuid // check uuid
final UUID uuid = UUIDHandler.getUUID(args[1]); final UUID uuid = UUIDHandler.getUUID(args[1], null);
if (uuid == null) { if (uuid == null) {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]); MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]);
return false; return false;
@ -373,7 +373,7 @@ public class Cluster extends SubCommand {
} }
} }
// check uuid // check uuid
final UUID uuid = UUIDHandler.getUUID(args[1]); final UUID uuid = UUIDHandler.getUUID(args[1], null);
if (uuid == null) { if (uuid == null) {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]); MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
return false; return false;
@ -468,7 +468,7 @@ public class Cluster extends SubCommand {
MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER); MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
return false; return false;
} }
final UUID uuid = UUIDHandler.getUUID(args[2]); final UUID uuid = UUIDHandler.getUUID(args[2], null);
if (uuid == null) { if (uuid == null) {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]); MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]);
return false; return false;

2
src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
View File

@ -121,7 +121,7 @@ public class DebugClaimTest extends SubCommand {
} }
} }
if (uuid == null) { if (uuid == null) {
uuid = UUIDHandler.getUUID(line); uuid = UUIDHandler.getUUID(line, null);
} }
if (uuid != null) { if (uuid != null) {
MainUtil.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line); MainUtil.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line);

2
src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -221,7 +221,7 @@ public class DebugExec extends SubCommand {
if (args.length != 2) { if (args.length != 2) {
return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>"); return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>");
} }
final UUID uuid = UUIDHandler.getUUID(args[1]); final UUID uuid = UUIDHandler.getUUID(args[1], null);
if (uuid == null) { if (uuid == null) {
return MainUtil.sendMessage(player, "player not found: " + args[1]); return MainUtil.sendMessage(player, "player not found: " + args[1]);
} }

2
src/main/java/com/intellectualcrafters/plot/commands/Deny.java
View File

@ -73,7 +73,7 @@ public class Deny extends SubCommand {
if (args[0].equalsIgnoreCase("*")) { if (args[0].equalsIgnoreCase("*")) {
uuid = DBFunc.everyone; uuid = DBFunc.everyone;
} else { } else {
uuid = UUIDHandler.getUUID(args[0]); uuid = UUIDHandler.getUUID(args[0], null);
} }
if (uuid == null) { if (uuid == null) {
if (UUIDHandler.implementation instanceof SQLUUIDHandler) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) {

4
src/main/java/com/intellectualcrafters/plot/commands/Purge.java
View File

@ -63,7 +63,7 @@ public class Purge extends SubCommand {
caller.message("/plot purxe x;z &l<world>"); caller.message("/plot purxe x;z &l<world>");
return false; return false;
} }
final UUID uuid = UUIDHandler.getUUID(args[0]); final UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
caller.message("/plot purge " + args[0] + " &l<world>"); caller.message("/plot purge " + args[0] + " &l<world>");
return false; return false;
@ -149,7 +149,7 @@ public class Purge extends SubCommand {
DBFunc.purge(worldname, ids); DBFunc.purge(worldname, ids);
return finishPurge(length); return finishPurge(length);
} }
final UUID uuid = UUIDHandler.getUUID(args[0]); final UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
final Set<Plot> plots = PS.get().getPlots(worldname, uuid); final Set<Plot> plots = PS.get().getPlots(worldname, uuid);
final Set<PlotId> ids = new HashSet<>(); final Set<PlotId> ids = new HashSet<>();

2
src/main/java/com/intellectualcrafters/plot/commands/Remove.java
View File

@ -112,7 +112,7 @@ public class Remove extends SubCommand {
break; break;
} }
default: default:
UUID uuid = UUIDHandler.getUUID(args[0]); UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
if (plot.getTrusted().contains(uuid)) { if (plot.getTrusted().contains(uuid)) {
if (plot.removeTrusted(uuid)) { if (plot.removeTrusted(uuid)) {

2
src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
View File

@ -56,7 +56,7 @@ public class SetOwner extends SubCommand {
} }
private UUID getUUID(final String string) { private UUID getUUID(final String string) {
return UUIDHandler.getUUID(string); return UUIDHandler.getUUID(string, null);
} }
@Override @Override

2
src/main/java/com/intellectualcrafters/plot/commands/Trust.java
View File

@ -73,7 +73,7 @@ public class Trust extends SubCommand {
if (args[0].equalsIgnoreCase("*")) { if (args[0].equalsIgnoreCase("*")) {
uuid = DBFunc.everyone; uuid = DBFunc.everyone;
} else { } else {
uuid = UUIDHandler.getUUID(args[0]); uuid = UUIDHandler.getUUID(args[0], null);
} }
if (uuid == null) { if (uuid == null) {
if (UUIDHandler.implementation instanceof SQLUUIDHandler) { if (UUIDHandler.implementation instanceof SQLUUIDHandler) {

2
src/main/java/com/intellectualcrafters/plot/commands/Undeny.java
View File

@ -88,7 +88,7 @@ public class Undeny extends SubCommand {
} }
break; break;
default: default:
UUID uuid = UUIDHandler.getUUID(args[0]); UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
if (plot.removeDenied(uuid)) { if (plot.removeDenied(uuid)) {
count++; count++;

2
src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
View File

@ -90,7 +90,7 @@ public class Untrust extends SubCommand {
} }
break; break;
default: default:
UUID uuid = UUIDHandler.getUUID(args[0]); UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
if (plot.removeTrusted(uuid)) { if (plot.removeTrusted(uuid)) {
count++; count++;

2
src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View File

@ -66,7 +66,7 @@ public class Visit extends SubCommand {
public boolean onCommand(CommandCaller caller, String[] args) { public boolean onCommand(CommandCaller caller, String[] args) {
PlotPlayer plr = (PlotPlayer) caller.getSuperCaller(); PlotPlayer plr = (PlotPlayer) caller.getSuperCaller();
ArrayList<Plot> plots = new ArrayList<>(); ArrayList<Plot> plots = new ArrayList<>();
UUID user = UUIDHandler.getUUID(args[0]); UUID user = UUIDHandler.getUUID(args[0], null);
if (user != null ) { if (user != null ) {
// do plots by username // do plots by username
plots.addAll(PS.get().getPlots(user)); plots.addAll(PS.get().getPlots(user));

2
src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -301,7 +301,7 @@ public class list extends SubCommand {
plots = new ArrayList<>(PS.get().getPlots(args[0]).values()); plots = new ArrayList<>(PS.get().getPlots(args[0]).values());
break; break;
} }
UUID uuid = UUIDHandler.getUUID(args[0]); UUID uuid = UUIDHandler.getUUID(args[0], null);
if (uuid != null) { if (uuid != null) {
if (!Permissions.hasPermission(plr, "plots.list.player")) { if (!Permissions.hasPermission(plr, "plots.list.player")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player"); MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player");

6
src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java
View File

@ -92,7 +92,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
setMerged(merges, world, id, 0); setMerged(merges, world, id, 0);
} }
} }
UUID owner = UUIDHandler.getUUID(name); UUID owner = UUIDHandler.getUUID(name, null);
if (owner == null) { if (owner == null) {
if (name.equals("*")) { if (name.equals("*")) {
owner = DBFunc.everyone; owner = DBFunc.everyone;
@ -149,7 +149,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ")); final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
final String name = r.getString("player"); final String name = r.getString("player");
final String world = LikePlotMeConverter.getWorld(r.getString("world")); final String world = LikePlotMeConverter.getWorld(r.getString("world"));
UUID denied = UUIDHandler.getUUID(name); UUID denied = UUIDHandler.getUUID(name, null);
if (denied == null) { if (denied == null) {
if (name.equals("*")) { if (name.equals("*")) {
denied = DBFunc.everyone; denied = DBFunc.everyone;
@ -170,7 +170,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ")); final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
final String name = r.getString("player"); final String name = r.getString("player");
final String world = LikePlotMeConverter.getWorld(r.getString("world")); final String world = LikePlotMeConverter.getWorld(r.getString("world"));
UUID helper = UUIDHandler.getUUID(name); UUID helper = UUIDHandler.getUUID(name, null);
if (helper == null) { if (helper == null) {
if (name.equals("*")) { if (name.equals("*")) {
helper = DBFunc.everyone; helper = DBFunc.everyone;

2
src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java
View File

@ -94,7 +94,7 @@ public class PlotMeConnector_017 extends APlotMeConnector {
setMerged(merges, world, id, 0); setMerged(merges, world, id, 0);
} }
} }
UUID owner = UUIDHandler.getUUID(name); UUID owner = UUIDHandler.getUUID(name, null);
if (owner == null) { if (owner == null) {
if (name.equals("*")) { if (name.equals("*")) {
owner = DBFunc.everyone; owner = DBFunc.everyone;

3
src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@ -36,6 +36,7 @@ import com.intellectualcrafters.plot.util.InventoryUtil;
import com.intellectualcrafters.plot.util.PlayerManager; import com.intellectualcrafters.plot.util.PlayerManager;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler; import com.intellectualcrafters.plot.util.UUIDHandler;
import com.intellectualcrafters.plot.util.UUIDHandlerImplementation;
import com.intellectualcrafters.plot.uuid.UUIDWrapper; import com.intellectualcrafters.plot.uuid.UUIDWrapper;
import com.plotsquared.bukkit.listeners.APlotListener; import com.plotsquared.bukkit.listeners.APlotListener;
import com.plotsquared.bukkit.util.SetupUtils; import com.plotsquared.bukkit.util.SetupUtils;
@ -279,7 +280,7 @@ public class SpongeMain implements IPlotMain, PluginContainer {
} }
@Override @Override
public UUIDWrapper initUUIDHandler() { public UUIDHandlerImplementation initUUIDHandler() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }