From 136161c18ee718a3c0cdac9df67c220fac12cbc1 Mon Sep 17 00:00:00 2001 From: fullwall Date: Wed, 12 Sep 2012 20:32:31 +0800 Subject: [PATCH] Revert "Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501" This reverts commit 91d4ba015135bafcd95f18aebd518d09f7bb5e9e. --- src/main/java/net/citizensnpcs/npc/CitizensNPC.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index 2d63776d5..b3b5a61b0 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -19,6 +19,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; +import org.bukkit.metadata.FixedMetadataValue; public abstract class CitizensNPC extends AbstractNPC { protected EntityLiving mcEntity; @@ -140,6 +141,8 @@ public abstract class CitizensNPC extends AbstractNPC { mcEntity.world.addEntity(mcEntity, SpawnReason.CUSTOM); mcEntity.world.players.remove(mcEntity); + getBukkitEntity().setMetadata(NPC_METADATA_MARKER, + new FixedMetadataValue(CitizensAPI.getPlugin(), true)); // Set the spawned state getTrait(CurrentLocation.class).setLocation(loc); @@ -163,4 +166,6 @@ public abstract class CitizensNPC extends AbstractNPC { ex.printStackTrace(); } } + + private static final String NPC_METADATA_MARKER = "NPC"; } \ No newline at end of file