Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-21 03:51:29 +02:00
Code Issues Projects Releases Wiki Activity

Use combined Set instead of just traitnames

Browse Source
This commit is contained in:
fullwall 2013-01-14 22:57:07 +08:00
parent a1caa11113
commit c2a70dde86
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/Citizens.java
View File

@ -314,7 +314,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
return goalCount;
}
});
traitFactory.addPlotters(metrics.createGraph("traits"));
saves.addPlotters(metrics.createGraph("Storage type"));
metrics.start();
@ -333,9 +332,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
public void storeNPCs(CommandContext args) {
storeNPCs();
boolean async = args.hasFlag('a');
if (async)
if (async) {
saves.saveToDisk();
else
} else
saves.saveToDiskImmediate();
}

16
src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -1,6 +1,7 @@
package net.citizensnpcs.npc;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
@ -36,6 +37,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
public class CitizensNPC extends AbstractNPC {
private EntityController entityController;
@ -99,13 +101,13 @@ public class CitizensNPC extends AbstractNPC {
// Load traits
String traitNames = root.getString("traitnames");
Iterable<DataKey> keys = traitNames.isEmpty() ? root.getRelative("traits").getSubKeys() : Iterables.transform(
Splitter.on(',').split(traitNames), new Function<String, DataKey>() {
@Override
public DataKey apply(@Nullable String input) {
return root.getRelative("traits." + input);
}
});
Set<DataKey> keys = Sets.newHashSet(root.getRelative("traits").getSubKeys());
Iterables.addAll(keys, Iterables.transform(Splitter.on(',').split(traitNames), new Function<String, DataKey>() {
@Override
public DataKey apply(@Nullable String input) {
return root.getRelative("traits." + input);
}
}));
for (DataKey traitKey : keys) {
if (traitKey.keyExists("enabled") && !traitKey.getBoolean("enabled")
&& traitKey.getRaw("enabled") instanceof Boolean) {