Merge branch 'master' into commandHandler

This commit is contained in:
Tim Düsterhus 2011-07-28 13:08:35 +02:00
commit 8f6c895d05

View File

@ -196,7 +196,7 @@ public class WarMapper {
for (String command : War.war.getCommandWhitelist()) {
commandWhitelistStr += command + ",";
}
warConfig.setString("commandWhitelist", makersStr);
warConfig.setString("commandWhitelist", commandWhitelistStr);
// defaultLoadout
String defaultLoadoutStr = "";