Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-04 22:41:27 +01:00
Code Issues Projects Releases Wiki Activity

Prevent loading Blueprint Bundles that have duplicate uniqueIds

Browse Source 
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1117
I also slightly improved the logs.
This commit is contained in:
Florian CUNY 2020-01-11 11:38:30 +01:00
parent 31d92961b7
commit c307f9b844
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
View File

@ -182,24 +182,21 @@ public class BlueprintsManager {
public void loadBlueprintBundles(@NonNull GameModeAddon addon) {
// Set loading flag
blueprintsLoaded.add(addon);
Bukkit
.getScheduler()
.runTaskAsynchronously(
plugin, () -> {
// Load bundles
blueprintBundles.put(addon, new ArrayList<>());
// See if there are any schems that need converting
new SchemToBlueprint(plugin).convertSchems(addon);
if (!loadBundles(addon)) {
makeDefaults(addon);
loadBundles(addon);
}
// Load blueprints
loadBlueprints(addon);
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
// Load bundles
blueprintBundles.put(addon, new ArrayList<>());
// See if there are any schems that need converting
new SchemToBlueprint(plugin).convertSchems(addon);
if (!loadBundles(addon)) {
makeDefaults(addon);
loadBundles(addon);
}
// Load blueprints
loadBlueprints(addon);
// Clear loading flag
blueprintsLoaded.remove(addon);
});
// Clear loading flag
blueprintsLoaded.remove(addon);
});
}
/**
@ -225,14 +222,22 @@ public class BlueprintsManager {
try {
BlueprintBundle bb = gson.fromJson(new FileReader(file), BlueprintBundle.class);
if (bb != null) {
blueprintBundles
.get(addon)
.add(bb);
plugin.log("Loaded Blueprint Bundle '" + bb.getUniqueId() + FOR + addon.getDescription().getName());
loaded = true;
// Make sure there is no existing bundle with the same uniqueId
if (blueprintBundles.get(addon).stream().noneMatch(bundle -> bundle.getUniqueId().equals(bb.getUniqueId()))) {
blueprintBundles.get(addon).add(bb);
plugin.log("Loaded Blueprint Bundle '" + bb.getUniqueId() + FOR + addon.getDescription().getName() + ".");
loaded = true;
} else {
// There is a bundle that already uses this uniqueId.
// In that case, we log that and do not load the new bundle.
plugin.logWarning("Could not load blueprint bundle '" + file.getName() + FOR + addon.getDescription().getName() + ".");
plugin.logWarning("The uniqueId '" + bb.getUniqueId() + "' is already used by another Blueprint Bundle.");
plugin.logWarning("This can occur if the Blueprint Bundles' files were manually edited.");
plugin.logWarning("Please review your Blueprint Bundles' files and make sure their uniqueIds are not in duplicate.");
}
}
} catch (Exception e) {
plugin.logError("Could not load blueprint bundle " + file.getName() + " " + e.getMessage());
plugin.logError("Could not load blueprint bundle '" + file.getName() + "'. Cause: " + e.getMessage() + ".");
plugin.logStacktrace(e);
}
}