diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java index 542bb9863..27fcd17d1 100644 --- a/main/src/main/java/net/citizensnpcs/Citizens.java +++ b/main/src/main/java/net/citizensnpcs/Citizens.java @@ -63,7 +63,6 @@ import net.citizensnpcs.npc.CitizensNPCRegistry; import net.citizensnpcs.npc.CitizensTraitFactory; import net.citizensnpcs.npc.NPCSelector; -import net.citizensnpcs.npc.ai.speech.Chat; import net.citizensnpcs.npc.ai.speech.CitizensSpeechFactory; import net.citizensnpcs.npc.profile.ProfileFetcher; import net.citizensnpcs.npc.skin.Skin; @@ -338,11 +337,10 @@ public void onEnable() { return; } + speechFactory = new CitizensSpeechFactory(); npcRegistry = new CitizensNPCRegistry(saves, "citizens"); traitFactory = new CitizensTraitFactory(); selector = new NPCSelector(this); - speechFactory = new CitizensSpeechFactory(); - speechFactory.register(Chat.class, "chat"); Bukkit.getPluginManager().registerEvents(new EventListen(storedRegistries), this); if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java b/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java index f2166b5fd..5c82c0e85 100644 --- a/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java +++ b/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java @@ -15,6 +15,10 @@ public class CitizensSpeechFactory implements SpeechFactory { private final Map> registered = new HashMap>(); + public CitizensSpeechFactory() { + register(Chat.class, "chat"); + } + @Override public VocalChord getVocalChord(Class clazz) { Preconditions.checkNotNull(clazz, "class cannot be null"); @@ -33,6 +37,9 @@ public VocalChord getVocalChord(Class clazz) { public VocalChord getVocalChord(String name) { Preconditions.checkNotNull(name, "name cannot be null"); // Check if VocalChord name is a registered type + if (name.equalsIgnoreCase("chat")) { + return new Chat(); + } if (isRegistered(name)) { // Return a new instance of the VocalChord specified try {