From 575c3a5b990cdbd27af671a0435364f7a66193e4 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Wed, 25 Jan 2012 04:32:24 -0600
Subject: [PATCH] added ability to send chat through an NPC

---
 lib/CitizensAPI.jar                       | Bin 17749 -> 17758 bytes
 src/net/citizensnpcs/Settings.java        |   3 ++-
 src/net/citizensnpcs/npc/CitizensNPC.java |  11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 00e47c700ed788d77fbf9306f21b1fbfef5f301b..cf8a213dd2388a22222d2a2e401992e8cb5c118d 100644
GIT binary patch
delta 845
zcmccG#dxoakvG7bnT3l11jLjqC-Q1Aiz-=ev~Un(>Neh7CAOGV5Gd@RYZRaUjgf(2
zFAD>M(&PuKGLyYzxa(v6g&jp~nRB;a&|1M77|3XUgUg~bKk4bgV`{!qDw&U&^Dn<m
zvEJ~;%=)s_-%Pt7%zpxp?cRKvNz+OAd*b<fcZ=WIe!q9~etq3PrVo78d}T6kj6`ZP
zZ!x!3ZoikdBH)S?`@w}4lX*<H-?J1HKFBQiYfpBP=r4H*8KtEx?(^;I*Y3D{=2v*z
zCJCOZjR9>7-<3IK?pWUQOVL@j&*tn=kHV@4Y6}azw`}s#Ilrj$%#^LCPtI<<aBGs-
zu2cN2lE*{-KNeZK(Kvc%^A+{4Q$nljeYf5WGTb7y_wQfH*M8RTz6zO_EWdZ|Z${fy
z?d%L`$?iIZ&XR(+?Z?*C248nxm_MWb<H!1QQ@@11T5Kt@@xuw(!|SSFYZROPT>VP>
z)!u0T3#}HBSy$z*bbe~>eDs9jUO<e-yx_?{weQMy<}dWA=Y6$g#pD@@XWzPPJpcRg
z<zTHFoi>RfBDbo}Ii#sf3W)LYH*`KI%{A+z(9fSKrSqK^pDAxE-BhAEd&~ODUsGdr
z$`;obzBxIKOT+W$hZR4~BH2#<yUA84F-<@0+tPX^+u)>x8O}v_^(R=1FdS0y5}V6&
zI%30)j;^Cx?<Ty{Tls8*%SWSkPYWkKXUwYH<MdHW?%7AFqx~OlJgaOf?e_n8=23A@
z#GND4j*3@gehh6}Z!CYiKvP`zTw2X%aafAk>>;;=5tvLSzmxv~N-ZxGEG3wMsb#W?
zr3EMzZH~8m&kB+cun*%!Nkx-4+b1%4%1wT#Dm}SePGEAS6Awt8zk>|ZYk8ok++-OA
zp~-U{z@n>xqE8jTqR$;nm~JZqnd*~W91WO$DFK=KlWmm6C+~68VmhY^<eE;Fb<$$m
zq(1qhv*P3|CrhT68epcZrrhMC&H|IaI7u=6)r1O(Pxf%OV`9;Ta>XWpFk+h=15|a@
pS&DJ{<PXk~Olyt6k~uE+Ospng<~bKrroRxTnyV(8oFypl0034RZXo~w

delta 863
zcmccD#dx)gadHBa)I=$1W_}g(jTR1KOadyKtHc(w3JR#0J1q98<a^7=z_5;mfkA1K
zqReD38SZ*t|Jx2CbC#;`spwu{^NRizyCPOY`)k;&qKqpZ6P3EAtZ2VycJ7ppg!QMq
zpsn`3%=QcHxxQBB@@R-CU1je-KCd$W-n(DtZ=Td_;J;Dy;oLzrXUz%AY!h}ouF7rG
z+IUTa=lhY3DJyozJrC$%<#!eNu+B3?q$a7rV+yBC?Y}K=>ix9#zUL7&l=vdFkf-^1
znNsGC^*z6Im1TKr&mIjZta_j}wLp8zwk)Oo#~aVg{d)T7?1dL@bv@gq)zKoUdgcG;
zmL(f4V|U-xQ9nDS{C9=#_Lp9UTcq~RovZoVPwm~;OC}}DZ=U;{(Kc24_60K|!M_2M
zGQQv9@6CL^Y$boozQo@8`ajQiP1^5PY{KuNRO5Ag!_#}arnJubboGnq_utX}7g{av
zUYTXPB3YC}Sp6mAo`pLD_DopzdVNW`MxC3{Z_|uPll&|Xue#kix#7FJyZe<5!oLr#
zu-No>PU9KZ6veo6eujscSbrw*#w#yAqu*wFs%T};mi3k2rrtVV{y6Z_>1kXi>tk=;
z&d*!E+hJS%Gj-m>kB-LGzLxj8KSfd^Z9<&)W)beq42hhn-F|(dXCmjgUrpjIKUv-%
zV;rHduVZP`ef56~Uz_xW;}0HgS}#=Ja(vr4;Wd#pUFl-;AGaQzUXl9I^j<{F`9kLW
zm2Az~+LiT;0p83kTnr2h91NfY;p#kPbCld{MqnzL{9XPBD6xE0u#}h_Z6z?-%2FGY
zh&E?fzGnr=N7{$+q9mfpd+ZaL9ONc5DoRgokQ12f<-h|{7vUho^hh2kDmPhGL1?m=
zt$=iV@MEV<KuaG2u^JG=z>>y0lP@|1GhI@g{LxW;vYZkdNcm(AWdR<9l8;J2N&U&|
z932^tPX6GSz_@a9pi?x{1C7ZOoy{lPXmU(`>!ii>MH9>oaJFaqtpjAHGp#e6tZ1S*
zS=z;%X^9b-`N~Li@;PUL$+KLfnEn_8g>)uY0IlOTMYisX30SRw4clY~Q{l-Tt^#bL
ImLS&v0R5m~b^rhX

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", "<b>You selected <a><npc><b>!"),
-        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());