Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-28 17:38:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

default to offline-mode uuid if owner isn't valid.

Browse Source
This commit is contained in:
boy0001 2015-09-13 13:30:28 +10:00
parent a6535d3b7b
commit 052019bb35
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import com.google.common.base.Charsets;
import com.intellectualcrafters.configuration.file.FileConfiguration; import com.intellectualcrafters.configuration.file.FileConfiguration;
import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
@ -75,6 +76,7 @@ public class ClassicPlotMeConnector extends APlotMeConnector
column = "ownerId"; column = "ownerId";
} }
final boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME; final boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME;
int missing = 0;
while (r.next()) while (r.next())
{ {
final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ")); final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
@ -160,7 +162,11 @@ public class ClassicPlotMeConnector extends APlotMeConnector
} }
if (owner == null) if (owner == null)
{ {
if (name.length() > 0) {
owner = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.toLowerCase()).getBytes(Charsets.UTF_8));
}
MainUtil.sendConsoleMessage("&cCould not identify owner for plot: " + id + " -> '" + name + "'"); MainUtil.sendConsoleMessage("&cCould not identify owner for plot: " + id + " -> '" + name + "'");
missing++;
continue; continue;
} }
} }
@ -172,6 +178,12 @@ public class ClassicPlotMeConnector extends APlotMeConnector
final Plot plot = new Plot(world, id, owner); final Plot plot = new Plot(world, id, owner);
plots.get(world).put(id, plot); plots.get(world).put(id, plot);
} }
if (missing > 0) {
MainUtil.sendConsoleMessage("&cSome names could not be identified:");
MainUtil.sendConsoleMessage("&7 - Empty quotes mean PlotMe just stored an unowned plot in the database");
MainUtil.sendConsoleMessage("&7 - Names you have never seen before could be from people mistyping commands");
MainUtil.sendConsoleMessage("&7 - Converting from a non-uuid version of PlotMe can't identify owners if the playerdata files are deleted (these plots will remain unknown until the player connects)");
}
for (final Entry<String, HashMap<PlotId, boolean[]>> entry : merges.entrySet()) for (final Entry<String, HashMap<PlotId, boolean[]>> entry : merges.entrySet())
{ {