Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-22 08:00:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow single plot areas to load survival worlds

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-17 13:46:33 +10:00
parent 59f89980a3
commit 0fdc5eafbd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
View File

@ -1390,7 +1390,7 @@ import java.util.zip.ZipInputStream;
ConfigurationSection section =
this.worlds.getConfigurationSection("worlds." + world);
plotworld.saveConfiguration(section);
plotworld.loadConfiguration(section);
plotworld.loadDefaultConfiguration(section);
this.worlds.save(this.worldsFile);
} catch (IOException e) {
e.printStackTrace();

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
View File

@ -36,8 +36,8 @@ public class SinglePlotArea extends GridPlotWorld {
SetupObject setup = new SetupObject();
setup.plotManager = "PlotSquared:single";
setup.setupGenerator = "PlotSquared:single";
setup.type = 0;
setup.terrain = 0;
setup.type = TYPE;
setup.terrain = TERRAIN;
setup.step = new ConfigurationNode[0];
setup.world = worldName;
SetupUtils.manager.setupWorld(setup);

5
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
View File

@ -69,13 +69,10 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
}
@Override public PlotArea getApplicablePlotArea(Location location) {
PlotArea found = super.getApplicablePlotArea(location);
if (found != null)
return found;
String world = location.getWorld();
return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
area :
null;
super.getApplicablePlotArea(location);
}
@Override public PlotArea getPlotArea(String world, String id) {