From 2f2da3b52818142842f82f4ccee71153fa9c2819 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Thu, 29 Nov 2012 13:59:33 +0800
Subject: [PATCH] Pull methods up

---
 src/main/java/net/citizensnpcs/npc/CitizensNPC.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 521c50827..7c01db4de 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -49,11 +49,6 @@ public abstract class CitizensNPC extends AbstractNPC {
 
     protected abstract EntityLiving createHandle(Location loc);
 
-    @Override
-    public boolean despawn() {
-        return despawn(DespawnReason.PLUGIN);
-    }
-
     @Override
     public boolean despawn(DespawnReason reason) {
         if (!isSpawned())
@@ -95,11 +90,6 @@ public abstract class CitizensNPC extends AbstractNPC {
         return navigator;
     }
 
-    @Override
-    public Trait getTraitFor(Class<? extends Trait> clazz) {
-        return CitizensAPI.getTraitFactory().getTrait(clazz);
-    }
-
     @Override
     public boolean isSpawned() {
         return mcEntity != null;