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

Revert "Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501"

Browse Source 
This reverts commit 91d4ba0151.
This commit is contained in:
fullwall 2012-09-12 20:32:31 +08:00
parent 91d4ba0151
commit 136161c18e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.metadata.FixedMetadataValue;
public abstract class CitizensNPC extends AbstractNPC { public abstract class CitizensNPC extends AbstractNPC {
protected EntityLiving mcEntity; protected EntityLiving mcEntity;
@ -140,6 +141,8 @@ public abstract class CitizensNPC extends AbstractNPC {
mcEntity.world.addEntity(mcEntity, SpawnReason.CUSTOM); mcEntity.world.addEntity(mcEntity, SpawnReason.CUSTOM);
mcEntity.world.players.remove(mcEntity); mcEntity.world.players.remove(mcEntity);
getBukkitEntity().setMetadata(NPC_METADATA_MARKER,
new FixedMetadataValue(CitizensAPI.getPlugin(), true));
// Set the spawned state // Set the spawned state
getTrait(CurrentLocation.class).setLocation(loc); getTrait(CurrentLocation.class).setLocation(loc);
@ -163,4 +166,6 @@ public abstract class CitizensNPC extends AbstractNPC {
ex.printStackTrace(); ex.printStackTrace();
} }
} }
private static final String NPC_METADATA_MARKER = "NPC";
} }