Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-27 06:42:57 +02: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 6b72472e5e
commit a67ddbe66c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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