Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-16 02:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1673

Browse Source 
+ unrelated plotme conversion fix
This commit is contained in:
Jesse Boyd 2017-08-10 16:35:53 +10:00
parent f49d43d6a3
commit c36ef1d237
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,8 @@ public class PlotMeConnector_017 extends APlotMeConnector {
PS.log("&6Denied (" + key + ") references deleted plot; ignoring entry."); PS.log("&6Denied (" + key + ") references deleted plot; ignoring entry.");
continue; 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); plot.getDenied().add(denied);
} }
@ -162,7 +163,8 @@ public class PlotMeConnector_017 extends APlotMeConnector {
PS.log("&6Allowed (" + key + ") references deleted plot; ignoring entry."); PS.log("&6Allowed (" + key + ") references deleted plot; ignoring entry.");
continue; 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); plot.getTrusted().add(allowed);
} }
resultSet.close(); resultSet.close();

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

@ -151,7 +151,7 @@ public class DebugExec extends SubCommand {
@Override @Override
public boolean onCommand(final PlotPlayer player, String[] args) { public boolean onCommand(final PlotPlayer player, String[] args) {
List<String> allowed_params = List<String> 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) { if (args.length > 0) {
String arg = args[0].toLowerCase(); String arg = args[0].toLowerCase();
String script; String script;