Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-01 14:08:08 +01:00
Code Issues Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
fullwall 2013-01-23 15:31:22 +08:00
parent c44e60ae01
commit f58bac5cd0
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,4 +350,4 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
private static final String COMPATIBLE_MC_VERSION = "1.4.7"; private static final String COMPATIBLE_MC_VERSION = "1.4.7";
} }

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

@ -1,6 +1,5 @@
package net.citizensnpcs.npc; package net.citizensnpcs.npc;
import java.util.List;
import java.util.Set; import java.util.Set;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -36,13 +35,11 @@ import com.google.common.base.Function;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
public class CitizensNPC extends AbstractNPC { public class CitizensNPC extends AbstractNPC {
private EntityController entityController; private EntityController entityController;
private final CitizensNavigator navigator = new CitizensNavigator(this); private final CitizensNavigator navigator = new CitizensNavigator(this);
private final List<String> removedTraits = Lists.newArrayList();
public CitizensNPC(int id, String name, EntityController entityController) { public CitizensNPC(int id, String name, EntityController entityController) {
super(id, name); super(id, name);
@ -148,40 +145,9 @@ public class CitizensNPC extends AbstractNPC {
} }
@Override @Override
public void removeTrait(Class<? extends Trait> clazz) {
Trait present = traits.get(clazz);
if (present != null)
removedTraits.add(present.getName());
super.removeTrait(clazz);
}
private void removeTraitData(DataKey root) {
for (String name : removedTraits) {
root.removeKey("traits." + name);
}
removedTraits.clear();
}
public void save(DataKey root) { public void save(DataKey root) {
root.setString("name", getFullName()); super.save(root);
metadata.saveTo(root.getRelative("metadata"));
navigator.save(root.getRelative("navigator")); navigator.save(root.getRelative("navigator"));
// Save all existing traits
StringBuilder traitNames = new StringBuilder();
for (Trait trait : traits.values()) {
DataKey traitKey = root.getRelative("traits." + trait.getName());
trait.save(traitKey);
PersistenceLoader.save(trait, traitKey);
removedTraits.remove(trait.getName());
traitNames.append(trait.getName() + ",");
}
if (traitNames.length() > 0) {
root.setString("traitnames", traitNames.substring(0, traitNames.length() - 1));
} else
root.setString("traitnames", "");
removeTraitData(root);
} }
public void setEntityController(EntityController newController) { public void setEntityController(EntityController newController) {