Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2024-11-22 18:26:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix compilation error in the import command

Browse Source
This commit is contained in:
Thijs Wiefferink 2018-06-01 19:54:02 +02:00
parent 6b9866a4c4
commit 38cd77e487
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java
View File

@ -80,7 +80,7 @@ public class ImportJob {
messageNoPrefix("import-loadConfigFailed", regionForSaleConfigFile.getAbsolutePath()); messageNoPrefix("import-loadConfigFailed", regionForSaleConfigFile.getAbsolutePath());
regionForSaleConfig = new YamlConfiguration(); regionForSaleConfig = new YamlConfiguration();
} else { } else {
importRegionSettings(regionForSaleConfig, regionForSaleGroup.getSettings(), null); importRegionSettings(regionForSaleConfig, regionForSaleGroup.getSettings(), null, false);
regionForSaleGroup.setSetting("priority", 0); regionForSaleGroup.setSetting("priority", 0);
} }
@ -150,7 +150,7 @@ public class ImportJob {
} else { } else {
// RegionGroup with all world settings // RegionGroup with all world settings
RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName()); RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
importRegionSettings(worldConfig, worldGroup.getSettings(), null); importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
worldGroup.setSetting("priority", 1); worldGroup.setSetting("priority", 1);
worldGroup.addWorld(worldFolder.getName()); worldGroup.addWorld(worldFolder.getName());
plugin.getFileManager().addGroup(regionForSaleGroup); plugin.getFileManager().addGroup(regionForSaleGroup);
@ -186,7 +186,7 @@ public class ImportJob {
// Import parent region settings into a RegionGroup // Import parent region settings into a RegionGroup
RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName); RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null); importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null, false);
parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0)); parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0));
parentRegionGroup.saveRequired(); parentRegionGroup.saveRequired();