package org.inventivetalent.npclib.npc.living;

import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.inventivetalent.npclib.annotation.NPC;
import org.inventivetalent.npclib.entity.living.EntityArmorStand;
import org.inventivetalent.npclib.entity.living.NPCEntityLiving;

@NPC(id = 30,
	 type = EntityType.ARMOR_STAND,
	 bukkit = ArmorStand.class,
	 nms = "EntityArmorStand",
	 entity = EntityArmorStand.class)
public class NPCArmorStand<N extends NPCEntityLiving, B extends LivingEntity> extends NPCLivingAbstract<N, B> {
	protected NPCArmorStand(N npcEntity) {
		super(npcEntity);
	}
}

@@ -119,47 +119,8 @@
 pe;%0A
-import org.bukkit.entity.LivingEntity;%0A
 impo
@@ -165,16 +165,16 @@
 on.NPC;%0A
+
 import o
@@ -234,73 +234,8 @@
 and;
-%0Aimport org.inventivetalent.npclib.entity.living.NPCEntityLiving;
 %0A%0A@N
@@ -397,18 +397,16 @@
 morStand
-%3CN
  extends
@@ -413,76 +413,51 @@
  NPC
-EntityLiving, B extends LivingEntity%3E extends NPCLivingAbstract%3CN, B
+LivingAbstract%3CEntityArmorStand, ArmorStand
 %3E %7B%0A
@@ -481,17 +481,32 @@
 orStand(
-N
+EntityArmorStand
  npcEnti

remove type arguments (Let's hope I was just tired and they had no further purpose...)