Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-09-19 11:31:10 +02:00
Code Issues Projects Releases Wiki Activity

Fix cloned Citizens; resolves #166

Browse Source
This commit is contained in:
Daniel Saukel 2016-11-22 20:45:58 +01:00
parent 2671db8b40
commit 191f47b092
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java
View File

@ -21,6 +21,7 @@ import io.github.dre2n.dungeonsxl.world.DGameWorld;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.AbstractNPC;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -83,10 +84,10 @@ public class CitizensMobProvider implements ExternalMobProvider {
@Override @Override
public void summon(String mob, Location location) { public void summon(String mob, Location location) {
NPC npc = CitizensAPI.getNPCRegistry().getById(NumberUtil.parseInt(mob)); NPC source = CitizensAPI.getNPCRegistry().getById(NumberUtil.parseInt(mob));
if (npc != null) { if (source instanceof AbstractNPC) {
npc = registry.createTransientClone(npc); NPC npc = registry.createTransientClone((AbstractNPC) source);
if (npc.isSpawned()) { if (npc.isSpawned()) {
npc.despawn(); npc.despawn();
} }

30
core/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java
View File

@ -22,10 +22,13 @@ import java.util.Iterator;
import java.util.UUID; import java.util.UUID;
import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.event.NPCCreateEvent; import net.citizensnpcs.api.event.NPCCreateEvent;
import net.citizensnpcs.api.npc.AbstractNPC;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.npc.NPCRegistry; import net.citizensnpcs.api.npc.NPCRegistry;
import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.trait.MobType; import net.citizensnpcs.api.trait.trait.MobType;
import net.citizensnpcs.api.util.DataKey;
import net.citizensnpcs.api.util.MemoryDataKey;
import net.citizensnpcs.trait.ArmorStandTrait; import net.citizensnpcs.trait.ArmorStandTrait;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -121,12 +124,37 @@ public class DNPCRegistry implements NPCRegistry {
* @return * @return
* a clone of the NPC * a clone of the NPC
*/ */
public NPC createTransientClone(NPC npc) { public NPC createTransientClone(AbstractNPC npc) {
NPC copy = createNPC(npc.getTrait(MobType.class).getType(), npc.getFullName()); NPC copy = createNPC(npc.getTrait(MobType.class).getType(), npc.getFullName());
DataKey key = new MemoryDataKey();
save(npc, key);
copy.load(key);
for (Trait trait : copy.getTraits()) { for (Trait trait : copy.getTraits()) {
trait.onCopy(); trait.onCopy();
} }
return copy; return copy;
} }
// Like in AbstractNPC#save(DataKey), but without persistence stuff
public void save(AbstractNPC npc, DataKey root) {
if (!npc.data().get(NPC.SHOULD_SAVE_METADATA, true)) {
return;
}
npc.data().saveTo(root.getRelative("metadata"));
root.setString("name", npc.getFullName());
root.setString("uuid", npc.getUniqueId().toString());
StringBuilder traitNames = new StringBuilder();
for (Trait trait : npc.getTraits()) {
DataKey traitKey = root.getRelative("traits." + trait.getName());
trait.save(traitKey);
traitNames.append(trait.getName() + ",");
}
if (traitNames.length() > 0) {
root.setString("traitnames", traitNames.substring(0, traitNames.length() - 1));
} else {
root.setString("traitnames", "");
}
}
} }