From 4c022b1a378df3a7fd0316e823bb72cb416d00e1 Mon Sep 17 00:00:00 2001 From: aPunch Date: Mon, 12 Mar 2012 13:50:48 -0500 Subject: [PATCH] Call super remove(), fix trait loading bug --- lib/CitizensAPI.jar | Bin 48772 -> 48550 bytes .../net/citizensnpcs/npc/CitizensNPC.java | 1 + .../npc/CitizensTraitManager.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar index 0078de4ef81d36953eea3029a7107308f420af97..46f5600de56d55246beca9f7bd9c7f169e451e7c 100644 GIT binary patch delta 10225 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 M!2u;`xqtpET3 diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java index b0cc7c85e..ebf32c33e 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java @@ -101,6 +101,7 @@ public abstract class CitizensNPC extends AbstractNPC { @Override public void remove() { + super.remove(); manager.remove(this); if (isSpawned()) despawn(); diff --git a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java index 0efd91215..5a31d9522 100644 --- a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java +++ b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java @@ -77,7 +77,7 @@ public class CitizensTraitManager implements TraitManager { if (clazz == null) return null; Trait t = getTrait(clazz, npc); - t.setName(name); + //t.setName(name); return (T) t; }