diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar index 00e47c700..cf8a213dd 100644 Binary files a/lib/CitizensAPI.jar and b/lib/CitizensAPI.jar differ diff --git a/src/net/citizensnpcs/Settings.java b/src/net/citizensnpcs/Settings.java index 1d429f0bd..086c43ecd 100644 --- a/src/net/citizensnpcs/Settings.java +++ b/src/net/citizensnpcs/Settings.java @@ -34,7 +34,8 @@ public class Settings { USE_DATABASE("use-database", false), SELECTION_ITEM("npc.selection.item", 280), SELECTION_MESSAGE("npc.selection.message", "You selected !"), - QUICK_SELECT("npc.selection.quick-select", false); + QUICK_SELECT("npc.selection.quick-select", false), + PRINT_CHAT_TO_CONSOLE("npc.chat.print-to-console", true); private String path; private Object value; diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java index c54ec6409..d072810fc 100644 --- a/src/net/citizensnpcs/npc/CitizensNPC.java +++ b/src/net/citizensnpcs/npc/CitizensNPC.java @@ -1,5 +1,6 @@ package net.citizensnpcs.npc; +import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.api.DataKey; import net.citizensnpcs.api.event.NPCDespawnEvent; import net.citizensnpcs.api.event.NPCSpawnEvent; @@ -15,6 +16,7 @@ import net.citizensnpcs.util.Messaging; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; public class CitizensNPC extends AbstractNPC { private CraftNPC mcEntity; @@ -90,6 +92,15 @@ public class CitizensNPC extends AbstractNPC { spawned = true; } + @Override + public void chat(String message) { + String formatted = "<" + getFullName() + "> " + message; + for (Player player : Bukkit.getOnlinePlayers()) + player.sendMessage(formatted); + if (Setting.PRINT_CHAT_TO_CONSOLE.getBoolean()) + Messaging.log(formatted); + } + public void save(Storage saves) { DataKey key = saves.getKey("npc." + getId()); key.setString("name", getFullName());