Add --registry to /npc list, let getNPC(Entity) use the Entity handle

CitizensDev · Mar 4, 2014 · c9b7c9d · c9b7c9d
1 parent aec7293
commit c9b7c9d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1075,7 +1075,7 @@ public void rename(CommandContext args, CommandSender sender, NPC npc) {
         }
         Location prev = npc.isSpawned() ? npc.getEntity().getLocation() : null;
         npc.despawn(DespawnReason.PENDING_RESPAWN);
-        npc.setName(Colorizer.parseColors(newName));
+        npc.setName(newName);
         if (prev != null)
             npc.spawn(prev);
 

diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -23,7 +23,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -120,9 +119,7 @@ public NPC getNPC(Entity entity) {
             return null;
         if (entity instanceof NPCHolder)
             return ((NPCHolder) entity).getNPC();
-        if (!(entity instanceof LivingEntity))
-            return null;
-        Object handle = NMS.getHandle((LivingEntity) entity);
+        Object handle = NMS.getHandle(entity);
         return handle instanceof NPCHolder ? ((NPCHolder) handle).getNPC() : null;
     }
 

diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -353,10 +353,6 @@ public void run(Player rider) {
             handle.motY *= 0.98F;
         }
     }
-
-    public static void registerControllerType(EntityType type, Class<? extends MovementController> clazz) {
-        controllerTypes.put(type, clazz);
-    }
 
     private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps
             .newEnumMap(EntityType.class);