From 01d073e6dd147cec1c1849e062017ecb7b5d3789 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Tue, 7 Feb 2012 04:37:12 -0600
Subject: [PATCH] moved NPC rotation to LookClose trait, fix name color saving

---
 lib/CitizensAPI.jar                           | Bin 23688 -> 23702 bytes
 src/net/citizensnpcs/NPCUpdater.java          |  34 ---------------
 src/net/citizensnpcs/npc/CitizensNPC.java     |   4 +-
 src/net/citizensnpcs/npc/NPCInventory.java    |   3 +-
 .../npc/entity/CitizensHumanNPC.java          |   6 ++-
 src/net/citizensnpcs/trait/LookClose.java     |  39 ++++++++++++++----
 6 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 41f4bc27bc164edca1de41f8af0be03f85078d61..95400e3fceb2ead497caaf2cc13c7d524991ab9e 100644
GIT binary patch
delta 5086
zcmZXYby(9~*vDan3>nh7(MS)FmeEK{jV|dDq@;y`goq&E=*AJ!NJuw=q;yM)N(l%8
z3c|bXdEWQBe4qVsKEM0>yW^a5?RT#0+%e6#sm-_~x|(?S#5kBA0ZS4I4*;JfN#X?n
z{oKcb8NUdiM<g|_Fa~P45*UQzN@LK0D~7>OT*-e#E@YS)G13}9j4|B+3TV_-0~P=n
z#u8-VVaNsa#l<j}7=qQ?NqDi`ChfuMm1I*``zd80*8W2kic3zwqAK6K;d=j=1P4b2
zf`h}0OroSi7sE%sp`k#S0H088QD1kCIy%)!<EyE$SU_Vr7Qp6D?-8*Q164VIL{zTs
zGwOFZ%CkN-N#nk4s5E+bFwErouz{;`G4>t5viW<a#fy%Ei+X?e%A%rc4@W;giG|4e
zKe($;=7LvSuMXO`M6N>*ZE)PZ)rl^=L?bVb<OxpKl^A5fPnlH_GaKm)wXTv?>&kSL
z0lJ?;x#JSnP_6+c`!cT`xx`=$Juon6!*1u|h^$nWypL;U<1HD}KuOQJs4OZyL_G52
z`Y}TXSr6?IC+Gp`I^Ve~-SA<9P{&IT?n#fbb`PGhRnm3o^QxBL?JUuXlFX}fhj_l1
zN+3DnjRA#Aj!14qC_~@J>Ftlb&Rv332@eRpniqc=(slNG^qdRi>h>OpURt?dv&P6p
zzs2tyKjh+E%i}wwy%dY#ia5_=yKbfUQ_6Bh-a`n3^vHQ>^ma}Ub}G$3oyug1+-F-R
zXXZ?)Wg(pI(fO`l<%m1PmYGQqq2E2A45vZyQ&UWGR6MUj41&W2WjPX=6z&DVGDHa}
z994v>&onmk$r&3ro||~U?A+Ima?d>{Yx<{(t!D~1Nu6?pUiH5H1Wg0wa1figus=##
zUk1d=+Qq3F(;iUOe$$}K&{BnaOxD{*c=3f+W{hwQ5Q+%f@iT35IQqoz8?xtR?8}79
zxy0#TmOX7moSJM0c$;iXNZJ<0D-3JheC=erkkVTIcrS)))2Jl>U4awtW`D?&cYI>@
zyo`NF$LsTNVHqps{Dt`HAcp55DtD`9zZb7EJa<ZtFG;bPlJD35cy_R}aiL)6{J}_X
zd|pV}oV#F1;F)8zKe0N#&#6iOn&D$ZZEc3Q6ERRx3W79_Gp=_i{Y5Z*dwss^+|W2F
zBcpy}c6}atp%vJtR$@$?YH@e7C^EyMlr1Gf+|}_;ztC#6WTHj_L#hMm!h}WXdZIkD
zcx6=^dln<ZHKTE~db=+y>04v3J??W&d<`kVpJXBqpm^o@{uCdX4;j19eu9vwz+U>T
z4;jr*gb+3s!IjomR5X!1fpatiBkON1mZ!B9##h?og1+4Co_*QAzhBokNVNcwjR(7&
zWWS=PK8QNqE&#eO-@L2I^mv4+q???5Gt*lE2$xkIzv?Wx+1+2tJC<oC^IfNqgs>~t
zWqj7%q@VP-CLWL%2x8SgTuyyRI4aDStHCSgK8tAMHIWtJTP$F)T%>8x7Z;r@O@5zQ
zIB1bdV?;?qcmVv(oh_~kzcET5*L-kY|7^&Eev<`H_al`}^;X;<_bnM|o45oJeX0xI
zi(%_3a9|5<8m*!rGQ!GP#}y{y{3yPB>6m!ZuAFV!3&;QA9i6ma`bC@iu(WSO=02@S
z^fm~iDKDw2aW7yl$_^(&YYfgjQ)re(ppVk5<e#=rg8I6?HA($eYcQHR=-u5jsBU*0
z0240MVuQ3~bCN?O)(QJnoRrh3n-q|BzEY}2uHIG9^27;Yd|AV4%?MFqqp^O<Ol4n}
zSB~AyPE8%pI(BS^+$M?)ZChYUz#6kOafB(#j!NBf488+{&$@bdKzHriq5G2+!-Sk#
zy>6Cenl~Pi_i3z1_>eQ85`uuY1?^3tE&7|!3)Jp7+@l&{vod`-eUt5HCAn&NOwwm+
zr3vMYj1SH*WI>U6O10s9utA2ArMO1PONmW^yD!&5S}elmT)YdQS@t3}D9yCTyNKF*
z?}$^!@D-_PPR#Z>ez~=$xXp0NR}G6VRH-LGX$MIstroZLAgt^UVlqlB;mlIjLP3Mj
zts01CN&m>>4bMnJsO=F{fLe;GQDyI*j(?%mfTkxZw!}&?+Hayrr@8h)T2AeYq63m#
zZ<Ni5WU}b9$8A&+yWVdf-&}Omd4teMLVbC(fEu<6Ozr8WfXr<YTAmJuLIitW__i4@
zTr~thgm*<F9}m@eooT(b#IaSp>#>-FXPg-^`?yL!8OZ}C`EqEHEKlGBDps-UEuHr4
ziSxQUlnB=1q<GTv$c<hjXcAV>lOs-AF4mn>?k>)L5VrlMwu!44KA(PnCjkN8-e-Hg
zNFY6T$2)e%p=$mk&rX7&R>`YWavjILr+O;h;vPlmI-hL4eRpuS`}@@!tMEU$NzvQc
zIeLE>JAgBG@|ZvRURQ3(`!)6#!RU(Pg;IiELCzq)xqZn2$}&|<bZnj$n)yAhe@M5#
z!=k(?e~nEfc_u}J`|C40+aqCw|65n1ox>Tm!4Jc@!BbH2C?6k7{k)_?oX;zMUsUS3
zGTz2<l+&SPQ;ftA-wX4twGxkR3myT-_-35H`2Uc)lUkxL^F@JOSi80U%AZXN<oyUf
zZrNi$^{_OwGC7X>I=^6zq9*F~s~52>vs+yg<ZZ>%9j^BVkf_pvbKF)g#8{qgZ}enE
zaY#YS;f=_zvNNY&o;Kdi9c1(|UbHVXed*wr1$@Mt+>k<2EK(o9`t!p%4sFKk@9cB(
zl!{)0UNbcGrTOgB^U`Nob0&VwMVT{&?c7(wn+sMvvsn!9QY_5+?sQwmLVUC(J}+i&
zh#co<<bOSNTWEARqfxNr2}1ZfMQp5y!2NWGf&(l?bLb3W8Ij9om-^ceQ0pTxyi0yF
z-q|VTmf9MEYGloLQOGzSgr3si&7n5xj3@TfX+28nUPJTCzm2V#Pn8bclI_A>VYs0S
zx!wnX*%zMlb9)-?4Y-{<_odFtnUYomvmsqV9&w&23iQ`Fe6I&sClHi}5GB(S)^kCr
zmp|-?l+(ZwH14v|Yk$OBB?sOUdBR?}(J1{%Fc4q^8+*bSjel@#2=y7N;hbs#c~7;T
zZ)|2;qWHQXZTp*zjoW$#%hA3Qw@?+^9K5&5e%QzvhZpnrP>zQ*fnLnGgnGQZMfrxm
zX;w76*<rrgUVtyrml`2DjUog|(#C(27xBw~pV}}RxP)w=<%!d)Eq5n%QzLL${6PNm
zqOIbnb)R(v74pT{&_NF}YKtppC<f+M^rdMC;i{?W+*)tAs%_X3+Y-C-x3$r{A7~z&
z4;_bv-;-T7fvRd>^9ni$d;(S!Z!Ol4KJ;YmH22CCSof1{CPgTi(3L>>Ts9*lm0Jk;
z2gK^jneW$M*^E&oxaZzp@)U3%T~r#)^DzJ8y2R8m#X;m85FWj|*C|NV@`WciW~a@<
z(C(5qA!Vx8S5;>2#@?v!JL?vo?hsuAJmaU5k{JPZ>b9pvoG}f-T;v{5^(V+P?<`HQ
zfnZ+O#$bX6Uq0ei(21LUpymX#|HQcajbw;5*W1GCUtSfk@S^)OCaLd#AWg)>>+mOl
z%0qj{&OS7JnaoNKlw3|eUx_Zgr~55d+S}hKGnb7g80{4z{b|FBmVC@5tfJH4#Tpgw
z`RHP0+a{4FIqgHBF)428C@}^r%Rtr}w0qU-tig`P8OI1qyAi!1tu=5rup-+n=??)-
z#-_%)P_WF|N|?EYBkgf{K82rvlH|(n`|94EW`Y>vVB)Cf+(o)ppoU`=L523`B3I+y
zxkv5=r9{Hbm-u7uWo9Y&LdJ$bA)<#w`;70}#{;Apm=sT5fvKoZzyN}N#~U#N6F<~^
z;NLa)BxDdlA76}(^4n4dMBf@hmS>eMHjUYi;*U|DG-|D7^nCWY#q}`ib@u9aC(-F&
zbt6X2bk2g+d<bwjdr7B}u@#G5NI~50uhjcu>U}Lg?q1_BhFn%IEHFuizr0Z+tU6_?
z<`a(efR5P0XB>UWKD_2Dk@q)fZ`=5={b|D0ZP0cXp)U5Q6(pwj$gNRA^3>jooU(8Y
z2veW;@U(17*e0)_nW><-Y070(t8y~V`7Gc!pm<k0qlP(u^QFjbW_$e5*uW!TaUoaW
zZz}lYlqAPP&zuS;+3l{Mlf%p%Y2>rbRHve|n??-6@=%E-^>^7YkFR-+6r9z4f3$2o
z;3kQ~2%m!91qjUHLitgdpA^rYn?bf>LUdzej$%=?^mUXG$e$d)+}}As^#V>*)g|q|
zNB;Wq4BEC7zi$3XzfPFBw^6tY_GXE|xxm==_FNip?@+4YeYh`mXa1dGqTw0*hc{+E
zuv?>^g~h|kY9{W5nL8M@>IU3uJa3&Fbnqq>Kol}HRhO2fX&(%~&dbY5u#wob7}bcZ
z4MB0Ql{9~Qe+lh>LPNWhv@*A+6693JxUKoy9QLSHedZ2jxeUqLRKn--MekOV4jR_t
zq+ePbqtm~Ly*poOU$a2U-KdLV=Y(0y!nilJ8zF>4p=W`otsg;n4wV|oe<+Q!6$v2M
zqKKBJVEh9gB%&niHDIFH?#=KSA8YWLcII&v;2Ixxg)7};Q1wLayI){?;)9fQ!^g?@
zt*dL~yyD?YpBYLN7j{jP*G>eFHPDCkfunBQGxq^<!2!WdkuxEO-`r#R=IYc$KdZ=$
zms}?NiCN97IboM!bAD9Y)Y%ntGSj;&E?g%JHPSc*4b-C{*SP<CnIl49=2Yb?9}DKW
z0B~@62yk%N{_oCoWe7wR!OcA=6sTn3Jj0dmc-!ApE(V$JIn=M*d}Y87Oq#x(D0?o>
zPnqu5+PVPIy>yX1$Gg<)7pbcez>QR9IzP>pT5Zl-MTA}f!a@R^x*p=Kkg3%;)_oUY
z1%4hW>*Z{Sq>^i*l+2~p{Q`_-HsGZ!106TR0m9{@iM4J<A59QxdRbBeX2=dtv)>EO
zKf3Hz!GO7uWn;h#0jQkc*vBZCcVVIoVAru~=eNM(xY<xcW^{ERfSx0Hal|S0vurq|
zKKGTmef*wi?J#6X){!<_o@S8Ulp<Xfr2%&`0pb~DL%*#5PG6bz46;2`WM@3FX5k_!
zcmgp}T<n8o<RhL@7jlj_t^PPOzA&yeCHq`L!$2A?Uwhk(6bWJ8OuP9rB4Q!teNtjn
zkj#UTuZPSzq~14)DoB1-KCN^BWuf%E_LOY;&&%-KX-=dQAyc>(>9<g(k3Q}^I6|_$
zDJA$Uxt6|vCvp_H`{%j(X~x;fO7Y7M^JQd@F92_a!o(9H^WDPq1;}S)GIze>*~5~a
z{*cghzh*1m$7!VR5y?Tn^NPygB<Zo~z-XwW|BmnjrnruImc^~Btt!xrnXf?cZ;I4~
zqfD*W?qy&6p1eqlidWn?FRU-o=-$nxV{|9tx1_l&^6D3GBZUmFMR;*rQ4i3Ka%qQk
zf#0mUl3aig!Z>|_F%Lyq3WR|?@h%^nEy8vgXl>LtK~1GcMi26$9OC(EVz1`LFTl$x
zzetzkKl>(2tXXlas{T@tTe<C4aK*Y~7n7iSOqcsDt;E`Oq`NMrIsOOfo#as3Q_;y#
zf{*J_{UPs_`ZY%be$xK^r)1!aIjA$e9gn@<f8)}`QjCWROHJN?uKz3oyI30}2*#36
zhyqJF;XP~{K|pMo0NqAF-jx1>=_U}v!m+R8Ww^0yl*PreMa~xM&ZOjvWr_+uCaf+?
z6NRyn@;XxJeg`sGM;>Ff>j+_Rpd*6;R9685FI`m(T68rrxS@9s18qIEe?%~{UQZD7
zxTU9ufuz1Z266h@7%c0XVMVw#2AOaR49?+(80Z*a-<2C!Vk}}q8_-`}4rG9#Cd+@m
zVQib`pP?|kf*sk-&cUyX-a#rnOb6$mj~=tX+PFA4+IToPJbwik-bM#7A@z*tF(uuM
zz<?btw8DriGNQ#O9cV>@2dh}~fc}#>Q?+5=8-1D>qfe82e<i-piw){9rbb#Dvty@i
zhD*Gfg`Pz}dKRL8IkO4;>&%69Bsn1aHHmf*L_0(Oa=ayov@u~t$_n1%`~PbsnEh<j
zjCQ6)2g&>uB!ILw(ZVdI$^;Bh5JqQ^L_QOyLduwtV9QY*TNXs27XTo|!IAzeQcw)-
zEP)I*rND$In1TTyY3u~XOtJg5jaEotSVbB}jY){{(=-DE5@fJyhYZPoCYmLZFVKoE
zLxi3v?_cGbk=<rem<*Tb3~h4Q3_41LNCk6jH4AevfJNzFl^j`Nj;+>$R?}3l>H~|L
ZNPG(hOa>MUFd#?sUzMFuUI$a?e*i$dv|<1N

delta 5019
zcmZXYc{J4F_s7RthOtw2CHp#zb?mZd8|#cMYxeA-7)zFj@UahrG}a^}d$K1YYm_yi
z?2@g>&&>DxJLlK=eg1e}pZmV|KF>X$<vHiMS<OTV%|ukj`Xr=a5dIpbPookf{y?85
zn?!tZ-@}a`S4A&IfQbl-hYpb}9#KSaJl+sV<8eSF_aBiTxGez&ZWDv?rWdi=1?p>v
zXNd7kB*T#4$xjhPgeMlvLD1W&gb4gW-9^x=X~zk6G(#xCK4Xj^q8_H#R;3OQme`~M
zfuuQrQDrWmoS7btq<CO@z;XU}?1s1jr)6<0;w`t^_$wHSwz!&UlPL4`_1>pn58Mi2
ztm%1e{uP){v-z!af%6#n^aRA0zT9VBEXZe^V;kGLHoLmr4Aq=DI=4$N^+v5963zeV
zI6ps!cXSAIVMCYG`au%|y%G6IXRMq*yJOFKryq_~^mn7z{ZtEZBytHFtZ}CTeGy!o
zCOg_^ihtW^?2Wmeob1VAFE1t?r$7B&$7SDXIk~JG^gDyb=+CaS3bykTQ`KF!<5I4X
zukw(EpUYp44MF?6b0BR05##tyRXbOClFF}T?c-Y1+0D803L5KEIVN$p<J^}007%E~
zQnvEx`zI3Uh^_9s6F=^fTwc=b{T`xhQxt3mUOYP10HJ#Z*Z24#Xp1lCy`>tWq246c
zzooy<??eAap?~it(wrl{om;eU9WJRvz!uF_?7Hb7HC2G@savm!!D2s(ZaX1KPcMxo
zyPQV0IZ3;^Z9)^)@blzZPFFq+T9uf(;Kcx=L8%8?(qJ+1km8x`Vne#tgdRm{kd3RC
z?DZH681oMpIV)-J+-S95H|wpuXkjg^j6xxl=Z*9jyA-0LZ#|{ST{Eo2BCwIgsP|Hs
zDV-BH>(X^c{RA(wk+{;hfq90e<vy82u>oMxo3~`ITCZ_Fg2(+A$`wJY%sjZdX-gl*
zR<egKpS&SJ+3>{0W>TZ}!y{$W6CPICR`Nz~D8QC13bjtVSwpu0O*c6xm<hB#GYQ-2
z*$c92=XDX>v)#Z5F5LNbFvAC~R0sBB5$~PkVGQpE_>1iVX?L>Yz-&J_5?ER@_E&>%
zq+9b?lZ$uc_qfg`qFS$SY)SR@=<r>k6p}$3-4k@}yHb_#RpX0mDWcEfH|}`sra#63
z$+zsK*XZ)gZun(wxU2S3AY{UD!2|W7TXpJT<vdje5uy>&=V%+8Gj!cAN_B4+0S^)Y
zn?pZKN63FtYJX%EEjjqpfG4C1xdr$huI?GOk!VS}9J)89`KCLN4`&vS>W=!}3aCT7
zg@!rxZO=usI9W;Pi&_t!e*7Yx3hAhWK5Fvg0pc}{K29~&zKKZxA)^%%Z^TsCBkAd^
zhckGC`SR!?;$e0km=k8GJQseZCA9n=NoEuJrsyxaMj?8<FHg?hgLjrg|LWtC*yS7E
zNe(O<L$<;G%|iu4ZHj)?@cSQ#g!2;6!cyK-Z9-NOP~qR#YSuq<Hf(|d`57pZ!gT=_
zFY!$QFKT(Z9)VO?BkyYrgIxXE`LB2(K+p+JVr-PGv&7r~+`XISd6Qd(mwL;k^wr>%
z*KN;DO$z-m9dKyQru3JmLhEH~lM^VH*c4?!hu>7Kp4DmVcX~(th{PuRlw~&1O{8&R
zQZ8A1xR#6ouhrx4(SCimVN+$Bsam$HI?X8?eh?yW@VexcPi~0fLB-sf0b<(}lIFW=
zHGGOT0{t6xI?TeA3_8Q)Bo^|vh8cRc>IhydMV2)W`Y9aBgOs0rIZSqLVZLmD-qwTn
z>7cG&I}lU>;1tBPZ)Lk6aExfUCa}_yFC-j@6g+5w=_HFK`{!}PkmZ5yUDeS#oqt?q
zeqO&>5~G_=sTrKT+H?E4_*Ek-wM^wsn@`jh;ONW-wf@8+x-}-Y_1iF}S!M&=Wi3&Y
zUQoBZc4p<|N+1%q96VdR9HCe==rQ|rfTabdPdToZZQ(xdlKh-$2!j@AHiOYl*O~mD
z2^OAnW!AAP*dNQydp?fSP|$5{mhV38TI`Dm$O(3L*+s<o=>=27Z>dT`Z}T~|Mtdcy
zC58N`SWGFOyo-L-NGcp;leA&B8(3>TD&CTh+qJ0~oT-Z{*t@FZqVD*1nojml;OxVY
z^)XTJ=#~KnSHK`U*&m%Erc|e!9l)Y~Px!^?ilV%I|Kz=-6eHmUG^kM`v|uK!$SaEy
z)@+=elrgkNq9pE}+tV$k>^bP-S|iQroahgW1zzM2^fBwSemat?o_XPUGvMak_cBw0
zJX)x92o)lp=_F{><hjG9;pDU^HF@9LNS2-Ys>SIF&moJ_>1njmwKQorExQwVcf_a<
z%HKk<FLZ*X#clM|c=DmfO#a?*j-lZCbZ)`8D-)}~+xuW188?LSiGbQkOllU(g4Yv<
z!qDQ?N6#nH`O1dvz}_sQ_umzNX><Je_$UvuymcjiD^Z}3$B*bOxQjvLs_o1TyLRmU
z(yPs9<L*5_I8hepkj>mzO4vFop_#sShBwR?urfl^S3RBE6fD1y4uT;`-SF-M3CUZy
z)thY0YFil7f!xe`Ov!1X-`cT7C6^c($NIK3g7mhbOzWnZqi@f>&F|JIH+zG$m_6@D
zZ@%LW<=_w0yVYZn$->t@ViK&iVAwkT$}#oYw@coxe`%7@?5{mud{~`(1n42b`78zy
zjXGs_NsLH;2iwq9*-2wF%hVZYoKnY_t1qPrVx~pLF~c=CVO7s&=5pcMhd9=<?_vRE
zE^E(Nt(On`-`Q)+lV)C0ptttEJH*y0*=JkH;b+KJS3mYnDxj6csrtLmmiyet_b8JD
zyE%8`*)RN+Xvq6x8-qM4EGsOLt>mfmvu9l@AtV(Mli#<L*CI2wf?<z?uVCes1lRuN
z8+TH^Z@0TMQOa-HU2BFEXa}$3){{+FthcUj6-m4fhL^=|gk>Q%q`brDC~GO!)O|T;
zb8uSrk#~nXXIm3IuZXQulsUYZ^N3!#&uSSi5xR_sKp&JOpd*`?Vp4ZYd<#NoH7_kv
zTe3&;+XR5-&twX#A7piQuPKg=T+2Smcm-OKOHqt0>LxR>A)gk;B~J_UF7!%kPd=V#
zXxsXFKkV3{scQUVW&EOWSE&Os;?D!R6_M8`+44sLr)5rTU%&C`+~)2+Ae$dOw%Zp-
zbdT$}k&2GvG;{*n^O~L%-B3z)FNl|D_Z)B<oYNds!eJ3d;W_QkCQL1NM31JZ9O5Wt
z?>Uc*W@kuhhQ`IaIWt*sKQ@2RSp3<-OH}hkB#k9Eg?OeCr=Zm{%2D~4z$na-(8~hh
zUMGX$Na<;{#+T;B^l<M>TXh913VOsfadWIMUY(=ucz=C$z$UQ1mn_xt8dpo;)Ean`
z|EcZJwa4OCh?p~JV%`>*_P#cQxUkMpS_7zdt<$7On3CSU5IAM$SYBy0(A}1Mm|GzI
zM4Cx7B)es8A-*LK5n|h3roh$iZ^T+ZCLk&pP$ZmN(3hXWHrul{vmRao^7y(RsBoXj
zvaAG6R^{!TCr}%m7DzJRx9<p}En=%^Fq~#o)qGrQ>J>SwSO0j56VWk8uG1-L-6;vd
ziiqs^N+A23s280}AH#EWam?`Yc;oFZhMX_ReMV+3b<KlYL;6mC8FFMFl11;*rU=)K
zbW6LFdSZJfJj9s&@6gQFjTlZljDMEMq%%c#xm9Vxv!3#Z|3LXeC!;ZYV(T!b!9AbS
zc*>oD&f?*D4D=2-G39ne+>wE8uXZV-tuQ|SK&mf4FDf)q()DsbCAGuocPn`~&9)$m
zD7!1yxA}Nq&$yYH2UWiy&WiQZv6lj-<)4TBtW!*t5_l_ONe;mj2m1_~H_`<3awVWs
zu38G)_MT=Z(JVb&PiGh}9}1J7(7kjt-jSEAKFM)eDRDP+M#nU$^O|wy(>{uZ7^|Q6
z48*Q_Hs_X%6n~$+#UuF;urb!b+SnrccVJo64!K311GI)F3d(PL{fmXlrdnAbE88%O
zZ;nOtrrV+5c_r;a%RTIPt)zW_rVtyNaZ-S3P-&&7Y(7@Wt@4OdeOW_JRDV3fD4@lZ
z$`V)G@{KBJ(V#@$Q&rzemwH>i<(eWxwfifjVyvf+wtEhn=N3fy%eWk%iQ1L4b2ycC
z=H65jEW|*8mqV_D$f5Lw;o$lh$ePf6Q}&|rO=BARDeY-;tSisG+}J-%rE_S9tQ||g
zSdm_8<fDSI1Yul^=FWACR<H2z%-9vf*<Rz&1l<a7N4(<B+qtHAq`%Z5Fw!n`<=a=U
z@4g3gSpNhb*~#Pl-(iZ0Pl{~2wKr03SH}IZ)2@zt0;MptD_dGVh+nc!Fq&@eXI$wp
z8ml&>I&yZj8tK_p$R2-@`13P*vVm%3<0mn4gse`PFZF;f>QwN>vF8^-pf2IC!tqsO
z%d?o&pwiLaPe>z2k`l9OFzM59r<+YF0njV88!WZ%`QH8RcMSLpF&>hB3XPt+DPPDD
zqPYp?vfVr1m%F#EZXYeN{m8;d#E{j+aocw31xQy7-9fr!Bz3{|JhG(FWOwN1CLCkR
zXJ5;%y>4frWePMk`Nb+GAMMz6D3sTHUxoACugp>^xq06MqKwDb>pnR6-NBe%%<@iy
zhK6~|r2x~L86jrK>Y@M{>LqrC_$sVHVuK~_I2WV!<YoxsqwOY5NWhJj_=4Z_ZR<8^
z3>FSF>g(tu*F~wo7}iIJ+@JFg&#wIM@$K@(@l9K`HHX*Nkr)K3B?E!318EFbfk+`z
zfXadbjWe^pORvVLY$|y4xstK!wa13{C%eAZT5jDW-WeSa1|6;kY*`eyTIYCMNfK2)
zTtY{xyuasa^_n*_^&JV<+R(}H+3uf_5qr=sc%FaJfOwu>r_Qy0Tk0A`j@IN#`e*e-
zu35-z3WxC&9V6Pf;#RqgNKP54V=(5L%VasW7R^~g9bo;6FMR3suYjimG1Pxn>6=`0
z>?uSVn-n*(g_NP+^sfCOor2V_pNM|`h<e|UM{P$*TBjq>m^<P%5KattQ{riS$2!B}
zY}t|$FeD}y#h%_@cjIM(mWAmZHwZDxhh~5G!L7TVFeT`N;xtH@4)+~e^%I4c<gY41
zCDqV0BF}h7<-AVftImYsBA3BZlpIu1s+D{wF~F8<*)s9q?Cc}~SDV@!)^046bDV4#
z-%LjOlPA3XWyA9&Uzm`=1A$={`=Fu^(Jx7wDLCH7p2%TW4%_}RsqjYUp;S{yQsg-`
zrt|CO3v-+cL+y9Ge}8ZN07u;ONsSC4&1yqahtxdpje|P48?jIIH<&ssD|hUM*@!c>
z3{v%=Gs1os;wnw4auRbOT4Jstt5AE+$8V;&Kd<cif70@(4wEqrA9X49wENT;swwAI
zsHiNsQvu#BFN?d$Ml75i6ycul$97+xU-H-&oM_qmL(}OI1NTeNI`G5+bB#Q*>9QX>
znL@|omKw^5ypA<{v8B(&YV;n7k4GERdcey{C{5$&Icu1GBwS!2_I_Gh%1`pyC*Lj!
zs8B6?cQLPX6)VRbUzIjmtcVCDkJDnnY7cp5grpY#YJFLj7RS^UneC>rD~>|G`Ahll
z*T~A7uwzIB0vVEk>V5d)2nYH@etiNp1Q`iL3jOE6FDAM{u-U}f36z(hC(r=8NoX9v
zrDw@58V3Li{0!eexT+XMaATAN2<%lRBJiDxBOzQwBZ$BfEmC}1eT9Ar-UbYf<S#lL
zz#}77yftVffybGV5*~`iYIvZHwefgotd9qii6$O4COZES*?}$-as2JRi3uKB2m~H^
z2tz#95h#LadK-^&QyV<U&CKzzH6!?%&1~`3RdWZ(KYa}#&Rn1C|NX;+#>{_)XHhs{
z*BnZS`9Dt<B=}E^HlS)j=*NUvuoKVn1GSc%z-tRe{E|Z#il87txopXdSGX<NiB*Iy
z6bZn`l7}!eiU_=bxp-%NBp?v%pP3nfmzEmb_zJ0ZXivs2eBu{zV*kVti34<qYrrjW
z8fxQ<_smFw?=0cBCcwmsotR64;7zp>!Y|%-p-4ght6Tvxp^Sh&ii%JK<GyWi?8O#F
zObr6T|5@M~V1m@cXBQyZiO&@X*|SI%LRlViL}t*7k|r)Tz<*2s3nv8XDl!32kW~0|
zB#NClN{OHjDN%|1TdcM!Myg1(6<_+rbVC0WP^C;r+CyEzPXo4QCw`%Fq3{Dn)+~6%
z<3gd=ASgA~gqU|1$|Eg;vZzl6END>!+%|+F#BA7!pXmSB0|6p!Xvrmw@T>g~;!Wh>

diff --git a/src/net/citizensnpcs/NPCUpdater.java b/src/net/citizensnpcs/NPCUpdater.java
index 1138779d4..29149b54b 100644
--- a/src/net/citizensnpcs/NPCUpdater.java
+++ b/src/net/citizensnpcs/NPCUpdater.java
@@ -1,14 +1,8 @@
 package net.citizensnpcs;
 
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.CitizensNPCManager;
-import net.citizensnpcs.trait.LookClose;
-
-import net.minecraft.server.EntityLiving;
 
 public class NPCUpdater implements Runnable {
     private final CitizensNPCManager npcManager;
@@ -24,34 +18,6 @@ public class NPCUpdater implements Runnable {
                 continue;
             CitizensNPC handle = (CitizensNPC) npc;
             handle.update();
-
-            // This needs to be handled somewhere...is this the best place?
-            EntityLiving search = null;
-            if ((search = handle.getHandle().world.findNearbyPlayer(handle.getHandle(), 5)) != null
-                    && npc.getTrait(LookClose.class).shouldLookClose())
-                faceEntity(handle, search.getBukkitEntity());
         }
     }
-
-    private void faceEntity(CitizensNPC npc, Entity target) {
-        if (npc.getBukkitEntity().getWorld() != target.getWorld())
-            return;
-        Location loc = npc.getBukkitEntity().getLocation();
-
-        double xDiff = target.getLocation().getX() - loc.getX();
-        double yDiff = target.getLocation().getY() - loc.getY();
-        double zDiff = target.getLocation().getZ() - loc.getZ();
-
-        double distanceXZ = Math.sqrt(xDiff * xDiff + zDiff * zDiff);
-        double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
-
-        double yaw = (Math.acos(xDiff / distanceXZ) * 180 / Math.PI);
-        double pitch = (Math.acos(yDiff / distanceY) * 180 / Math.PI) - 90;
-        if (zDiff < 0.0) {
-            yaw = yaw + (Math.abs(180 - yaw) * 2);
-        }
-
-        npc.getHandle().yaw = (float) yaw - 90;
-        npc.getHandle().pitch = (float) pitch;
-    }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java
index 42a236646..19992e9e8 100644
--- a/src/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/net/citizensnpcs/npc/CitizensNPC.java
@@ -8,7 +8,7 @@ import net.citizensnpcs.api.npc.trait.trait.Spawned;
 import net.citizensnpcs.npc.ai.CitizensAI;
 import net.citizensnpcs.trait.Inventory;
 import net.citizensnpcs.util.Messaging;
-import net.citizensnpcs.util.StringHelper;
+
 import net.minecraft.server.EntityLiving;
 
 import org.bukkit.Bukkit;
@@ -23,7 +23,7 @@ public abstract class CitizensNPC extends AbstractNPC {
     protected final NPCInventory inventory;
 
     protected CitizensNPC(CitizensNPCManager manager, int id, String name) {
-        super(id, StringHelper.parseColors(name));
+        super(id, name);
         this.manager = manager;
         inventory = new NPCInventory(this);
     }
diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/net/citizensnpcs/npc/NPCInventory.java
index aa33493be..822537a1d 100644
--- a/src/net/citizensnpcs/npc/NPCInventory.java
+++ b/src/net/citizensnpcs/npc/NPCInventory.java
@@ -1,6 +1,7 @@
 package net.citizensnpcs.npc;
 
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.util.StringHelper;
 import net.minecraft.server.EntityHuman;
 import net.minecraft.server.IInventory;
 import net.minecraft.server.ItemStack;
@@ -20,7 +21,7 @@ public class NPCInventory implements IInventory {
 
     public NPCInventory(NPC npc) {
         this.npc = npc;
-        name = npc.getFullName();
+        name = StringHelper.parseColors(npc.getFullName());
         contents = new ItemStack[size];
     }
 
diff --git a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java b/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
index 97d8e41a7..c0cefda96 100644
--- a/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
+++ b/src/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
@@ -3,6 +3,7 @@ package net.citizensnpcs.npc.entity;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.CitizensNPCManager;
 import net.citizensnpcs.resource.lib.EntityHumanNPC;
+import net.citizensnpcs.util.StringHelper;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.ItemInWorldManager;
 import net.minecraft.server.WorldServer;
@@ -12,6 +13,7 @@ import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Player;
 
 public class CitizensHumanNPC extends CitizensNPC {
+
     public CitizensHumanNPC(CitizensNPCManager manager, int id, String name) {
         super(manager, id, name);
     }
@@ -39,8 +41,8 @@ public class CitizensHumanNPC extends CitizensNPC {
     @Override
     protected EntityLiving createHandle(Location loc) {
         WorldServer ws = ((CraftWorld) loc.getWorld()).getHandle();
-        EntityHumanNPC handle = new EntityHumanNPC(ws.getServer().getServer(), ws, getFullName(),
-                new ItemInWorldManager(ws));
+        EntityHumanNPC handle = new EntityHumanNPC(ws.getServer().getServer(), ws,
+                StringHelper.parseColors(getFullName()), new ItemInWorldManager(ws));
         handle.removeFromPlayerMap(getFullName());
         handle.setPositionRotation(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
         return handle;
diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/net/citizensnpcs/trait/LookClose.java
index 59a627364..a2875e3ed 100644
--- a/src/net/citizensnpcs/trait/LookClose.java
+++ b/src/net/citizensnpcs/trait/LookClose.java
@@ -1,10 +1,15 @@
 package net.citizensnpcs.trait;
 
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
 import net.citizensnpcs.api.DataKey;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.trait.SaveId;
 import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.npc.CitizensNPC;
+import net.minecraft.server.EntityLiving;
 
 @SaveId("look-close")
 public class LookClose implements Trait, Runnable {
@@ -17,11 +22,7 @@ public class LookClose implements Trait, Runnable {
 
     @Override
     public void load(DataKey key) throws NPCLoadException {
-        try {
-            shouldLookClose = key.getBoolean("");
-        } catch (Exception ex) {
-            throw new NPCLoadException("Invalid value. Valid values: true or false");
-        }
+        shouldLookClose = key.getBoolean("");
     }
 
     @Override
@@ -31,8 +32,10 @@ public class LookClose implements Trait, Runnable {
 
     @Override
     public void run() {
-        // TODO Auto-generated method stub
-
+        EntityLiving search = null;
+        CitizensNPC handle = (CitizensNPC) npc;
+        if ((search = handle.getHandle().world.findNearbyPlayer(handle.getHandle(), 5)) != null && shouldLookClose)
+            faceEntity(handle, search.getBukkitEntity());
     }
 
     public void setLookClose(boolean shouldLookClose) {
@@ -47,6 +50,28 @@ public class LookClose implements Trait, Runnable {
         shouldLookClose = !shouldLookClose;
     }
 
+    private void faceEntity(CitizensNPC npc, Entity target) {
+        if (npc.getBukkitEntity().getWorld() != target.getWorld())
+            return;
+        Location loc = npc.getBukkitEntity().getLocation();
+
+        double xDiff = target.getLocation().getX() - loc.getX();
+        double yDiff = target.getLocation().getY() - loc.getY();
+        double zDiff = target.getLocation().getZ() - loc.getZ();
+
+        double distanceXZ = Math.sqrt(xDiff * xDiff + zDiff * zDiff);
+        double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
+
+        double yaw = (Math.acos(xDiff / distanceXZ) * 180 / Math.PI);
+        double pitch = (Math.acos(yDiff / distanceY) * 180 / Math.PI) - 90;
+        if (zDiff < 0.0) {
+            yaw = yaw + (Math.abs(180 - yaw) * 2);
+        }
+
+        npc.getHandle().yaw = (float) yaw - 90;
+        npc.getHandle().pitch = (float) pitch;
+    }
+
     @Override
     public String toString() {
         return "LookClose{" + shouldLookClose + "}";