Added buildout option (may clash, PM if need help)

If you have snapshot objects disabled, I recommend setting the option in
options.cfg to 1 before syncing, then setting it back afterwards, to
avoid a merge clash.
This commit is contained in:
Treeku
2013-12-14 10:25:56 +00:00
parent a67cbb0992
commit 44422ffb42
3 changed files with 12 additions and 3 deletions
+9 -1
View File
@@ -191,10 +191,18 @@ public class TerrainService {
public void run() {
Config config = new Config();
config.setFilePath("options.cfg");
boolean loaded = config.loadConfigFile();
if (config.loadConfigFile() && config.getInt("LOAD.SNAPSHOT_OBJECTS") > 0) {
if (loaded && config.getInt("LOAD.SNAPSHOT_OBJECTS") > 0) {
try {
core.objectService.loadSnapshotObjects(planet);
} catch (Exception e) {
e.printStackTrace();
}
}
if (loaded && config.getInt("LOAD.BUILDOUT_OBJECTS") > 0) {
try {
core.objectService.loadBuildoutObjects(planet);
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();