Fixed incorrect loading of disallowed blocks list from the configuration.

This commit is contained in:
sk89q 2011-01-16 13:36:36 -08:00
parent fb2727c9f2
commit bfa7ac6a48

View File

@ -20,6 +20,7 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.logging.FileHandler; import java.util.logging.FileHandler;
import java.util.logging.Handler; import java.util.logging.Handler;
@ -63,18 +64,9 @@ public void load() {
useInventoryOverride); useInventoryOverride);
maxBrushRadius = config.getInt("limits.max-brush-radius", maxBrushRadius); maxBrushRadius = config.getInt("limits.max-brush-radius", maxBrushRadius);
// Get disallowed blocks disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
disallowedBlocks = new HashSet<Integer>();
String defdisallowedBlocks = StringUtil.joinString(defaultDisallowedBlocks, ",", 0);
for (String b : config.getString("limits.disallowed-blocks",
defdisallowedBlocks).split(",")) {
try {
disallowedBlocks.add(Integer.parseInt(b));
} catch (NumberFormatException e) {
}
}
String snapshotsDir = config.getString("snapshots.directry", ""); String snapshotsDir = config.getString("snapshots.directory", "");
if (!snapshotsDir.trim().equals("")) { if (!snapshotsDir.trim().equals("")) {
snapshotRepo = new SnapshotRepository(snapshotsDir); snapshotRepo = new SnapshotRepository(snapshotsDir);
} else { } else {