Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 21:29:14 +01:00
Code Issues Projects Releases Wiki Activity

Reuse code

Browse Source
This commit is contained in:
fullwall 2012-10-30 21:31:15 +08:00
parent c5504379e4
commit 046ab7dd38
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,13 +92,10 @@ public abstract class CitizensNPC extends AbstractNPC {
// Spawn the NPC // Spawn the NPC
Spawned spawned = getTrait(Spawned.class); Spawned spawned = getTrait(Spawned.class);
CurrentLocation spawnLocation = getTrait(CurrentLocation.class); CurrentLocation spawnLocation = getTrait(CurrentLocation.class);
try { loadTrait(spawned, root.getRelative("traits.spawned"));
spawned.load(root.getRelative("traits.spawned")); loadTrait(spawnLocation, root.getRelative("traits.location"));
spawnLocation.load(root.getRelative("traits.location"));
if (spawned.shouldSpawn() && spawnLocation.getLocation() != null) if (spawned.shouldSpawn() && spawnLocation.getLocation() != null)
spawn(spawnLocation.getLocation()); spawn(spawnLocation.getLocation());
} catch (NPCLoadException e) {
}
metadata.loadFrom(root.getRelative("metadata")); metadata.loadFrom(root.getRelative("metadata"));
// Load traits // Load traits
@ -126,6 +123,13 @@ public abstract class CitizensNPC extends AbstractNPC {
} }
addTrait(trait); addTrait(trait);
} }
loadTrait(trait, traitKey);
}
navigator.load(root.getRelative("navigator"));
}
private void loadTrait(Trait trait, DataKey traitKey) {
try { try {
trait.load(traitKey); trait.load(traitKey);
PersistenceLoader.load(trait, traitKey); PersistenceLoader.load(trait, traitKey);
@ -134,9 +138,6 @@ public abstract class CitizensNPC extends AbstractNPC {
} }
} }
navigator.load(root.getRelative("navigator"));
}
@Override @Override
public void removeTrait(Class<? extends Trait> clazz) { public void removeTrait(Class<? extends Trait> clazz) {
Trait present = traits.get(clazz); Trait present = traits.get(clazz);