From 42ae0e35ada841154327b9f1b7e77d26fd358ef0 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Sat, 11 Feb 2012 08:33:19 -0600
Subject: [PATCH] removed Inventory from Citizens, added to API

---
 lib/CitizensAPI.jar                        | Bin 24227 -> 27215 bytes
 src/net/citizensnpcs/Citizens.java         |   2 +-
 src/net/citizensnpcs/npc/CitizensNPC.java  |   2 +-
 src/net/citizensnpcs/npc/NPCInventory.java |   2 +-
 src/net/citizensnpcs/trait/Inventory.java  |  96 ---------------------
 5 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 src/net/citizensnpcs/trait/Inventory.java

diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 5625feeba64c8a3d0fc2f33ba3cb85ca7458d45c..f8f0fbf51f8711267d5d2795bd165180fdc0894c 100644
GIT binary patch
delta 8533
zcmZvB1yodFxAxE>-QC@tLr6-;5JQI`4bsg3(jbUKNOuY--5}B}jndr$Qlo%e9Pj_#
z-@ERtHS_GV_p{&g&b#(H>pXiGbs|j8B4BH)At7S|{(Q#d)RM8;kVYRtEDotxS}nPs
z77lw{e*j8?z=zcLh$;voaO6W|f!-Qm{(md{iFP9h!P(acqW{g3Kzdvm>Vhcy$6x;u
zaS;)2#G_;){bAIzVR#|HjXX>$M7Ys~#s1eg#Oe7Ps==H7oArv&@2}@KQ7{7jW4f&6
zhm-^?900(U769OYo{LaH%SnhJVABQf-?(FAlrM7ML?9E$y+t!3;X_J@Br;NZ2bQB0
z$w%ShjpLTV*5aGzdu2!SZL`$Csmvw2#34&WHLJm$WG>c3vO+k#ML(suvA)q^#ml#?
z)q6Qu<7iQJ2y&W*O@`+na}api<#{T8<NP3Q2Rpox@kNo1&c;}OYKpNAxo9ztd=3i_
z<3(NXA-+0izJj@2!KjgVk<S^rsx%?YF&{Ra4$r+6Z_OHiNg=JFTawqn&TkLz(GWa3
zw+Cq}liX0xlwn(RzmXx85%)#_NMg5kQu^HY<~!IZ;5R1ZWN@wgW{tv+IkdZXjnYpz
z)NQMg&b3bl`8)~6%6tjQBR;X1&3T~s)V;AbH}!D#oGaAzt}N_9cj>`pT{7e@iS~i=
z)41PC(kbef#Pr!@(b+={=KW0CqPQQObX`dY`LYU999R`hM!=AB)Gslj*ylPB{>naH
z{SXWo^D`g*igvDZHE%$>je~63u!p?k>_i;kmrV(MBLdYM2}L7_;?ufJ3AIjIR$|-N
zZG}&(=XL3g$_$R~Jzlk)GkXW*c$|3Q=@SSPPrbp8T4pPc!3Fi3Kh+Ol$Y@ApJx;JR
zT9cn==aks!Bb@5;8~ECD(gS-o?ZGnLWI0oH!gC{O#jIQy?WybI1s&ciu5OVJQ&SWB
zRqgI71%&Ey6tY@DYz54cyNXW~p1ZS#OlZD%yH%?`OOd498sk_oMSry|952Os##GH;
zX#w(B$cHAfDyIb3>TtUBQ%Q28TWHy6{jRF3<;+cxTnTU6U2P3FNj&?OJNvOZ2v6%9
z65;c~lgl?h-smzB*ApmLd6@?9#n9LZ<?2Z18b;>~3MRINK-MjBPj5_md%r0>RlC>>
zDoFVu!83_?lTwGCh9zNe%p{+>0L5X1xOn;(1#e*-Re9`YcIgE$1q5wwt6<hcHJ8OH
zrOI#g6so)eit;!1!=nj&Jc>s2q!aihp|whWkhxgBfH4oMK(O6~5>gW882-`$J8E5H
z>rOO=?VII52rEG>LJkY(uqlg92XIzxOi!d4PZ+g(d21ESk-VAXT~eyuHdC~3W9seI
zMZMONI`IXkBX6Vllc|`SOD=XC^@1=fEw>w&RgNSpSXvo*>bpI+8tC-cPx}6F7vOFm
zvu=e#e0)H0Xv*|$xBPpY!v?fqbm^T=Is26dFH*sKNOXStvC_ik)OXrO0dcJwuC3u)
z<eZ0_LdF)Cn%MYVgY-ZG_IQU`G29ovCW+o<!3NJOK1<8zr<ykJsgKe4ZdMcvfZ}&`
zdVWPJPT?{u8V1fz{oGS2)5W38p%<;yua(3=jN~LMviwG)mQzRiayR**Ohzwt3|#gO
z^5O+*IAp2DWI7HoZ);~AwCLfCtrha?LZjO9c8o<4VD|%ngH_5h%^&DynqzLDYqLaL
z6idW{{nbVlDwIWrip$L#;Mtu@ZtEh%AJ-DQ6_X(ri>!9HtcLBt&&-7nGA<c^;{z%@
z+<NiVSvA_&CAqqaq+V^ZCf3gy+^W!~?jP?g2st+g_AKw?WOzKu<+EvLZ&od%msCIa
z%*ZnEMrd0E)V5Pyy38X<yuefETMy2hW^6~{vrRfCb~aVd#`<bE5+cm8?3J_iD#3<#
z^apk6GJA08CFd2Yx;P!0M)qe15DxqE_MMOPuS&6o%}S|~%|YMO0+Gk#v0K=0HjBdT
zzd|m2q#;EKmb3*1&+MCub7vK-#ZuJ8=}|sw7hFYWA{Ufizj2ZsQvDHA;wN{mZqJoF
z%!hNrK}bW-hG|M3btWzDxVZ(3h*cZP{2>z5_vTi^Up5h6uN26Z#y-f*0&d4s(4Xcj
z^{&61@!?!CNMT1P#d_j-7{Sgcpt@QlB@WrRiH=e_VK_}I{eltSs^QLVc<d)3>{>=>
zCx2W_A8mI~@#UaJuu>+#H#$?jgYs0zpO7_wpA<x+TL5%Wl^a+z|3Fw_Dw1GQ2EG0m
zo7an`t`f(*4+a(;f@(6@$whaptQG|~*~*<o&Ut`VBN5pG=TI0s;ba9Mh>VuL3bHZ`
zO%{JW97)iDyr&R6)s2=YV>6ijbF)Ou&a;JYTs}nUHSsc@+G|B+-HPN0>K%^+|6zan
z9?nbTaRw)rlNrewhoh=rEWa;Kw4QJ{f3()0r0OCk*9@&k<u?pmv741G80DX_Q&JmG
zLQ;EywaHNnQW=b66>KZhdz%BYe*FKQDplRC@9EZH$UmFXH%zLSoPw4$agIp%d_QN)
zkEANE;DLT>bMcb5_#BWjD!syCBFyezL4bxBEiBiq1KI+*q$D`ysc$a?4@NwYXf(ua
znOSB}D}Nc0rs9Mtxq8i2$7eJ)wc0)9ywKUa1QuQB_T}H7MdT!WmH4gnZ5P5uQ{>aW
zCnd@YX+;pzBf<Y!S${!C**AR`y5PoqK=y6c{a&R*G{c>1wJqIVy=1PX&dZ=qz>wX~
zu7Kl7QyOJ*e2O(f5=rZ<R}~V2{lkWy2ZVk*ww@~UV)D+QGSA6YaD}j*D8X=2HYmx2
z+BDc{bZYJlm`tUHJ*c%$-vw!r@68;I&%B8uE|JN`)B(K;pi#>rL6K+X$Yqzfwfx2+
zN44M?eS#cYDdCku?2~gKoZpZkHjy-z(8KYt6q+AHis`z7<(7ukjtU{cTC}5jEhrq#
zdNnv^5g571hI?6})F3)PftNv->ZrW3Lj5z=Wj8l?WEXFra@o^naswjO2N4hPei8k4
zwH<FY^*mCdK0sR7o(Q9UQ|6-dhs?sO3>{(5{j?)g&NaUk13le_AC#EN<TrPRyLD(@
zw<^rId&ZxGWV|ug^J(-mtOtZsUl|&maEk8+Qn+K`%31crr#d2|!FKaCzhTsH@_lxj
z*o!=kUe^IhEYJvZUvxqe-V+V@Z(4=eY7awXpTh*0fU$9E<ybPflbz`soyZm~8w3e2
zkC<UHMg1i|O_6BxM775#kf%Z=B4Ezjo=E*+Zrpe{EPzhkxHxlmeU6shh-}b$FVL*V
z*JArgd0Xho#-28LYg{EeGRI5N?x19@a1bBoO9ZD`*W{*RL=dE$N1P<%^R()6wO2LQ
zls6%kPyxw!3kLVT9I|hr{*m$Cs@a!DT)UTPnK?5AFh=<^AK+Wil?l-Ktn<{Ls|b>|
zFl$rGklnA^<>>e`ACt4L{3x%lGOUSn37ERn(YR_n2?fs?9G&c6&fOZ9eQZNa^55CK
zbW-F#BGX)d5dd)&Y$`%(zUU-1X^6V@-|>N+Gy0*qe0@gyz(&JtAvnJUygw`u#)k3N
zq$C8Rs9kRi9ym1#82^5E{Y(5LDb7Ivh6Qw8&-wMBg)V;~;j4iCP8?Je^ghP_;Oj5D
zCj~bSo7~3yGg5EbwP&-9qrS>ywZ7*Pv^x_R8<?qo=bHwx4RPDpJ)P#~Sa<jKTw|KQ
zY&JirS>CO<stP3VZJZB~kmyXF-k%Gsw;!^08J7_CGOFqh)p$Zv(Mlh$z4n|Y>TD+2
z&d&Cmd1YhL`C^jmB|+&e`jBM9^vbf^`tRGb86YSUjco8{MvPF|n~JlR=w@FmAO%5u
zs{{FFa$gM6HuXMxm)}h~K<2&N4GT`^glAz$pmwfD?+#VDual{LwyENC$Wi>FSS)rj
zaSMO^YeV-fB3FWlvX2$Ir_m<$_Kv{_bND=&Dy`^A!1rp({A#%Q6lglH<n0HocK6Mg
z->sPqb*;es?-0E!2SkG2#OSV%qiLQ5v)N4%=$ZFINRYb0!IHGCnOADd+q~J?{LR}0
z*0BOFFuB83BJAwuf|+A$naUzLkJD9diGze#kMY(p&wH}%!1}p75nqVCtBU!MpP-@`
zk)=FU6eQXimdm*(GrV&-HV4&4)>xO|8H7J8j#_md4Q%bq!|94n$xoEKl(!F|5napD
zY8kJD#Mz_jgCv#{+7r0*+_<;54G8?#xqn8ir1f)icq}mrHy?hOVE^cb-JnsRc5q8X
z+Klnx`}a$}Ust(YtHv?@WzDO%3_+x2-4)Xv`5;h*W-})qTa6LNTp+Rco+9S8M&Vxl
zV$R+oXry+5`|WMrqQ%U6kszbxWW(PRAKRJ_Ae)!keki}{_PZ-{kw~>ESvEph&iwh}
z<*N?E)6X%@`)f=;C4MY@g>LjTrP_LF>DlsS-CzP9KSoo_4L_OIk8Q=MOAyu$)2p8X
zz1NtvHyrgpgtMVaKn@KtUMnC=j-TnTvkAGCVC?2i==QbF$X1)6AN$2Cm_ATZy@PrZ
z5Aq>TH-q>7r^3eJ%<@jmGl$BJHg8{~%9?_OPcxJ?1>Zh>2*y1@4as5e&gip~u!!!)
z=b4TOmOUd6Y6{)Kd|mzBdca)vg3Iz~-l#hB`THe2lY{f#R{2-NuF76I9p=p+ees#K
zKGJk%Wp<*ua1~HjsWsO!>`X1oCbbReH*!L7Uws$n+n?xJ&yG^)7jBrU6!pu9k6&A#
z_w0)_$?KMH<8a$!6qcVotKmvK^S*hqI8toLnX`~7!npRtBr>Htx;W6g@TPf}ptDmr
zeg8F*3(EJ~A$cxpZmZy>{sT9nzz;`BxOB2k>7bE-`BF13=|QkKjqQ&1Z*<VX^JN_f
zx%M!*)%(QuA7ekm?I!j%YwomPkBHVDQB;y0h=Lgv@B6v-!oQoM{D@>s*S5&6M9lo<
z{$i0;74yvpy0x-;mDJCpW6ureC1D1wQ^gE2k++c`y$N#f<ZQvp6bKETY4&fQseQ-s
zYoht71PwhP?WK3e3(UN&IfSY?rAj<eft?h#2(kPV$MxNd$PN1_v)^BRq~zOka|Uam
zZQU3lpo_bCT)_X+zUY8I%5<Em<gdo`W_^nQm#CQRs(%eb4#K~N3+FT<{v%n|7y)xF
z3jqKaKmq`S{;1A+XP!?8@X(WTu|3#h=<+ed^B7`)TJYgPbk*EuWbuBp_-wvynM^SZ
zZ3-jFrnACuX8=ZozriyoM?VbSa)!Drd+#_iL|UMvGl<bm+_Cj7V!L3Z%%}O<z1R!%
zJEoQC4naD@yNQ4KlGALSs*1EW%n^gcRkCHv5~}T2*dQ>8o@Tg2zc}8)i4h+*T_^nQ
zbZEPCU%}J}g0ZQsAjzQPAkF=)^g~ocKz_-&yzMMnMf5K^s$ZM3KdE3W_#?3Ku4fAN
zHq(~sMDaWYhxe41x@6}{niLfox>ZQ6PMOJ=Xb}VCF?ywqE6&L7(-)FOJ)tNiA|vW|
zC(qQuLOXRWuRmTxFy(3l>GdW`8Cq&X$^!1!YK{xYAQw#8xkB8vlT($3Pp<pGu;edN
z-7W+rfmobPTRH?Ih8#IdpU-7!imQ2cUk>+^d?#p{Ah*rhG54ij_S`7gElkAhY2UxY
zP-9(P^|`jONB2DLB#)(s4F90rt!D_d$Y#giCI2CJw1{40t>L$Qk0PnTlxT8KNJO|d
z$Uvde4v9m2$UD#nl+>>`4rNSAp67mmpayT!MNc<iy!@%TP=#;-1~@mxF;8HOf-~L%
z_Xbs+>XDDgdj_U9@Sl>T)@J4q@@!!;q8m=KzPCt7pf(?+;@Ohm08N)=pljFAG8jgA
zqu)wa@eUD6PYeO2ucmh@ur`$Dy)Q`NRfhi9U_l4`X?JY!<NxhoTnQZgZGdcvETO=A
zCOyDAc-?)H3jIrwmtp-|Q_3-5$+gFtdh=LQf0`T&(BGy{Ag|w=X%RjpidrjJ;^B&?
zi)Ra=L&034$m!cBcC@Z!8PE_;dnvPm<2~fl^fgE1@WV7^f;riTdz}HnB}{Z!Evel^
z$8E0NZuZKlOji)fOVVawON(nSHtBmBS8Ep%W<9g2_C?Ebptf;_GFHjQuEBMonHrmS
zNhxX7R^5#CW{@eBXGRIrV5UF@kdF*L^@Y+7mPvA2)Zj?@jqY9m-kvEIQCUQmI$N)=
z%Q8LWZ5)rhFtB?)mTxmMsQEeXrc^NHXqZmLgqgFh1CNr|rdOrKXo%yCjLvawwc&X9
z=CPeap4HW<CTcUQhT3Ip8_|3b5<dYDzin`d1=OaD3i*(OQxBE~HMxA)-%D)#`EDQ~
ziK2<j@!_3ZmW1D`ckKzI!iq8yCsx*jphQ&UmSpEK)zCYp5Z97BVUZ;xg)Qk!M(m_E
zXBLJsEt0$W7xcR67iCOQ;vD`}-j01_?z}*d4*^qR)m=;6r=8?yQPUNLax#U%BbGiM
zL{i_}jUgHOlzE?|bp;}g;!@=<*Fl$qsAC(5>tFP1Wk(dJsf<ZgFrFdosI>_7tnxk+
zi?1Rc+BqNPuNz8pZw)o?89_dO18icjr?TddJ;0j~O_44dJKG?-yp9b-C1mTJ`|N$f
z`ae&o#~zw&1=<ebBnAKgBz}D8007Vn5jv=h9x6n|)yLM=%gw`|=ee_$r)R2RprwgE
z`9n^JYv!_#OOp@s?((9g!we7Kz~VRlChwK`>XVm|8&Qb9CnfD%8mb;9B6#OLM6@un
zI87qr*@}Fu2rt_oXOVGnaTBbCun^9!4B7i&QBjAw5~q8{z1)kO#~0i+Uridwc~3L~
zmktD*zN%Lm+pSzqa+PdA!w(cwFB*MD(jgo{vCP%G6mjj7(aD(LYYic5UN;lyFzKz9
z3(-P9?MD#5>Y{Tc9Jy8ejAqj!6@j}c|1=0Z<csWH79>Lujz){U>1Y(B-rIw>Yn{g>
zO*6pyQ6?f4R*dC~;@%u2!%QJfJs>5<R0X+lY|-kq6I!N~qq+_ElkIB7qu}SL@1+;A
zQrDDbJH(COW~{rb8l!ppwO1fe;YCv1;$-Bx|M9{Z%G9+Y|D9Uh4H(aYB+LS1^F0O4
z!kKWSrG<oT7Q5tozK7`=uNQQ+o_;s3qnh9f{I@e1ow1rrRL704yH;E<!%_`K>I@<5
ze$QVo5e1zbgn+D+(o+QjqtJXaGvX6+RCF244x|}d$A`dmKC#k)>55Wz-X-diQ+8kH
z8((l_Q5=r4B+zsAsC=Fv)61cie1fWd628b(N<0}Otly6v=?~&(i$GIv@7%u+2X6`8
z;o7PBlMIyFxEH3VQ{E@IRn=`BVJ$%xop;U7zKb~AEkkMb(7lfj1f!ifa|(&Os`weE
z8q2*r2Gz39$TP;|_(#>xizJAFX;t;Z4b|EwR7WCF*;V3Vt@^zI^Tan%3F`CN=$|qx
zOf!|93G1{QE$7a8r}A4fMY(XYvkIV2HaWoB!YA~I{fP{;N_;3{g+RgW2`Lb%A*o0~
zRdQ9Iy4b|n$WJno9W(s;yi!akd{*L&gHRgJB)Q<+Y$08wSnGk7uiEC+fzg=6(?&dY
zI}KwTI@7~_Sno2L^s$yi!4Hw=(j;y9#WP_;nZuP8WO)@~6b&<-J_D-Qd@i*E1cX2I
zdhFc-#AfVjn)_-qtv9&SiZCHl)xGRX6hh5LM)5TtR7$3sHV^}*^soyJO%KX&9%7QI
zM7*6pDH)6p=S)x0vxUeFj(*f11o$|>N)z2SmLzife7%B5mAyMK7mi>wT^}~kBtl|n
z@k1m+63V>pkhM6+#EmSymZK<z?(_yH&k_=u$eb)j$cn>c26?^i2t*<KFyfHv4N-}Z
z_%(d30n1GHFXw^4-unBLqAgrlk>4dNHDtho=#Yi3c53K51DDqw@uVXxE3tcvR^oRo
zgk5&9`<&K&Pn^YUkpIqb@WSt@)e96X4kiu>YZ4r$03PR4>jjRDcfmo43pggjA%ak?
zn&gIGdn#zgK&`=evIU3(L1%Cy7A2WkNs6+e`OZvgo=;`yv=_0Sej8@R#~LsF>h~1F
z@}NfN{u$ZMnnN~YMVogOFYsLzBg~YM^rR@4t}x>ty5C1}2V+LX+ic(aSeIG*a&fMz
zAcz-KUBlkgQA)(DdN5}xSJhja>D!L=T*e$U6#QC@Wi6K2aa@8pvKVQ52y#_;IaYF(
zY8tzC<y=Z=Bt??5>$Pn?PftzF1%ouLoIb|kJFq=xyY^~p9UZ!U7wEi4Un@V-XOz<X
zmRs_Jz^#Jf3I=tearXOiP@8W*+nK@p!Y7d}xkmh`#GfgfW=L_dGctS_N543bd$KuP
zW^Aek1}a8nFdKb`i0l{IGF_0r0}C6>nuqCpe;2e~kp-=3AhVe2(ZDPl;27CI_BNLf
zQuR8vQmTWZTQ15I6v+8dj)b2w#pkqE1Fi)erCXeCu0OW3SG^nQgql_e2P=(~Y`c}I
ztOXFdRZ>U7z8?rEj};>oYP#oFS!1TtH%CX2Pwvzb)_OBQN*DlkWcT;fwxS_SKFg`R
z^tfaSnsHj4X$}SBF8MA$fnHf(tN1N<FL>M#o0b=C=qg4uWdn6kY*UxQx1C>mZViD3
zB8}uxt~JHY#%GSAGF&+wz6R#d-HdovhmNQwWJS26l8+YY8_uKs;4KE6e|7pc==OHj
zU|uyxkN^sV%!BjH4xBKr#OqB{pG1S5jn@gs8uS4D+ZmsOesh}+Lb8I^hdsmV@%Dm3
zULJ2d3LkX*)SeN-oYQMRqxYi;y)oAXE;4!fiBCk})@#2GaE@AD#zAZQa`J37l*aJe
z3lD!-&c?I&q@FVEr_0W9l93nXj5YL=n{m*uB&N^8AgZfUHR}=esCODSy@BOyJnMLS
z>EIn+<GJ{F(_Q@<{jgHM41W4(3RW%8So*L+dIVPMLYTGlR_>6o8rrsAc?G*PCIrRb
zt^m_6edr1CPUK4rb4`aO@tgCdzBL@x36q~(4w*K6fn8!>XMUUs<oRZFuUee8BXM(I
z{bsHXgTS(T(YNyzk&+5(*p0zx$~xXf$}9VZXoGn~fgOobWsF1TrpC2cWme)OmMGTt
zJC(2NZCe0)l0L4*t22D0>6^rtMq9&%({8+<!EvK6#ZM{=lnr0*`r?7k>>7`fqVYvq
zj(Rk8DL1HD<z?mbqC!e~^wh^Lz{MLQ?#A2R5Yg<9=Q>BI*F2T@=bThnK7*d<uj#A4
z%m|=%jpJBKv(8~A6_(B|P+jftZSgr~6?W;&UeQoNDt~HEouVtodLvZz$h|lQ&WFNU
zQ!q&iNl2=%&)Z|9&2|7Dic@98HChPSTQ)MMAZ#FSep-$FVlb9nn#~u+54#;t4pCSG
zAfKif&zzH#8N|oNtPEV#PIkm+X_e%G0+P|7&18F=vQ@89HqE0%<=ySGw@8b=$eztf
zn<Y{>^zV8*_{R+GuM~r8ZqkRxyw_;2W^Q$-%9>G;2}TRUcBx3H=u8X4%4O=_92WKs
zlKU2ZGow-XQb0A3@f^I}&x|(c=H@y~519`tzeUe%qJ5ejC8Ye!SltLC#6!%9$WCT6
zWdUi3zek#NObzUTn5$Hi#`mcjYm*qOXx!&aV*YG}t0xc~aYMK%9_5`9mMY}TjP4xH
z6)A+|gVGw+vQ<VjqY{(!wx)k>h)?)+%h#}y=w;7j=Dd{IDeJbxwgU<uO4(e`2uSwZ
zCZ-0`+Srzvm)L@$ny(swzv6`Ky3lB_1BFc`d4$0~BSax`Qqk-Deu+JzJVTRtC^{i#
z<ZQ4HW86n&W~R78$_&U?Z>c7RtsFdUL`e5`KURqo>>PIli*xPy_LCVC4}38|yi-7c
zabg6a(T4xN@C54z`g33C(WYOaq(Ho1-o?fq%B1$7aJFU&1GDD*C7c>wS+%~k;?a{w
zd&S{!R@*hnZO|*r-+`ogmMRF9-Fr`uHF+Vn#2#6)ylug<uyFO=R-i1ja4sTAsGe$G
zVScy3E9jz0HS>nbuomru`@jN$a-rtN)!oXw{<H^#|9LI^GXcfMXt#?*dsGHCr~rTf
zTpc{V6+%tTu<I4&@c(KIBSrhaM&GkrWcb|l+i6bKv&W>$f09DYvFlMZ^^o8*TT>me
zKjUC%x{eH7pM2Hfh2s-lARJY7W#Kd4*Sbn@oYz%_BO^!w9(M#O!>=1as_^v?^t9oA
zJv|*bmg{N2<1jrVIO^$Jz_Cf+1dc=odT?|yFoN?34NT$JEQXfY|BQa2P(w91W5bXV
zv7ZU5!$S!r2NT0x{9sB%7go3{j};H<55}VVBj8_+S*1RCR8;woUncnc`|nS27$W;4
znFiVmCW7aGd(7A3fV+r|NZ>9WBT7VD&PNv?w2G4yS6dAMkqGI}5FOq~fEGN4C3qgg
zB3%C~B>PWq;Ges)@<H+C=pS1JxKM3lEcoBFFs4Lw5`eoyO-P{i#zb)U$fFw~_#Zco
z2|eAP!yvjaD~Ln^01zK%;gbI>?IQZ$WH$Kj-<wb(s6pvX8K4Iy<nXg_6hqMCe>{g-
zM7XZ_PjYdXsx&<HOo|wqZGr{A50)#P^u{Aa>oI}zKU4sqIBZ-7PA)MegRlCJX8nhF
zBMT?~HYKI|KV;2+sKsG4@{dGT6u7>DYMPS3H}Frj|A+i%12P(qbRnpN+25VoRM>=4
zKUR3uV}<kmLrl~Dvo17A@d>;h{v2PwKZvs&8334i)K_BvkP-BtQyN@QT5}5c@dM2%
b5g)*hE+Ob^b95Xw02`nX8vsZ*{gd=xpe}@*

delta 5571
zcmZWt2T)Vd(hj{hX#$}mARsMN0SUdvfRxaY5;{m1f)J&5l+cmh1w^`Z>CzF9CcP+4
zI*5w+hw$FKasE4#`S$F7yZ4;gn=`ZD*c4Vl8y1<477i{k;QBF&(s)J2ivvT0R5Z?(
zs`{&5Rt$U-xCRs*mM{i2up}@jjLnTI#iGI39av%*Jjas!PwYMhU9rK}So;op78_&4
z;AP-o3|=B{ER2yu47>@olis~CcE~$#LT@Q2Zag8>em9;gnm{aa^bWy-#)K9G<NyGQ
z6-A-IiXyS0LKYbj`RUL2T#Y%XJ`p>iWP1sYgxlJPnGldL*|5`u%-V8QtM^ItNKtIF
z$1#k21U(U6>4TV*R8p5X&fBraW%jr#+AO5Jw*pu1t_b>O?z=WiE`BN8-<kGldpZ7h
zN%F*wD=u^*=y36Aqu2i2mDlK&^YYKZ7{L8aeZu}jMI>QIBz^fIpxtT3i7==&mrkf`
zHFfH62tVjftYz=e&N;u;C1a2|nWbJpN1k1W<4U8VQ80b*h3na$EXuMV$;f5Bm}QDp
zio-MED@tTx+8+->WU#zJcTU-)JjI%j;sySdXk^Eu<qnBMN%qToSEC=6BMvDp`i0&4
zB)c!@u8<lcfd=3I)FMtS6)#|yna#fr6kd~BF<o_kaNfC)C%c4ERuLR6v%B;#DO@Jp
z4+Mphw-))eGWQVGpFF%hbNF4jJ!BV%8&25ROP>@?$#|5)9uzJ3g0GB*leaTh|CN~{
zjcJ#Hh|;WJjN+qvF=WR14^zV5L7hmA>AG?SU^2*hTP`0Om?16|Oosn6^_f#cG`2=a
zMkV<mqffO0LlU;ZfQiyH!!40Q-IbUG;zFoS@+dcI`Y1GuN?;rL@jkq_=AkUrZi4;m
zN?DfZggf_mG8^!i?0`>Oc0-eaG0cNrbMs31nmn$(%%WyyiXx98$6Kr0GDQLiYD4bH
z#d%~-UDmAnLR3yYDt%)^o!bu5XY;y8Y-aWy<IiEm1ENa}=is%Oq*n2b!u0`>qUDe8
zlN(flGWQ&ssD_rh%!_QE$}&7f;QD-OpNq|;IGJ0TDy?*(gwBV|MXmcHjEvQZ5*e#+
zMO1p5Ri0!9*~@0@N@VMWfA0syBZ3aWLd!@BlY#;h6$LMEs|FoKJYcF__ESv_+?a5n
z^9Gl>!AlfAXP|3c>qIh&Xg5~$>zgZmgn+MXz%f_)oCeSS>nP@N`$0~_`)wBE?%qpU
zL^4elDtrVsU8A-YBJGww9Ld@5fc-3=KRrXe=*Rt<_WhKOd5+HY%FT>{`)uEZL!=bh
zZ7Ur$gsb^H^;cwiv;#=j#(mR*BDV0>-F9Qx8{#IJHm96W{`gU!N79Z(peY>IJedLE
zgHf3RkV5rY_zq1g?QIPs`!V8_QEP=d8I!?@aT$;?VMntu7|6oymnMnV(j3u37ujH(
z-{O)XJ>i4L3?ddUGTblV^ggFNO_D=ySxC)?tQ&Ga8Q6pi_$!Z}A))t!U26@@gzFIt
zIqJrw1%1-OEt8%Vf#(cycX9$V!2JGhGuu=F6Hz6JnvjtU7@qStdli`^E^}91wf-FW
zEKO;FC*cdje7#*<g#OTRwbeSgSNGv#HpAV2p#h}=>D3QKu7-!ja2uC}i)fKp6_XEr
zJ*PZf$e@BDVfkOTAGE1ceMrZCuB24vg6LUdhBc-pam|sdI9Ov#D@|v5#<&Q306B4C
zpE3d}ho!s<qNs0!j#v(ZfD|IVV?k3dx%KiVTr^|q7$@vBTTHywhm+!*e9OH>O^3DR
zWNMCjN=2i*Gix;5Ku28Jk6n<b%GyoL(Azb0Niw!E>`yZ$!fLr6a#(#d)N6)k-jzER
zRPmu72uKrv%n8ci3KzkAiKm5npy7L>@Wwr=1<#OOrBhqh$zuytT<>D>p5EG7rYKto
zH_#R`SC#ZV1t%ORw)v7YT~r`IyGd=Uc1w}jZLsYkmd)_I-8^#nwj6R6TI!EAk~oz)
z$gRpbkVLJ^7VB3eKfx6#=A&$e$6=TV6HuX!vge>a(hd*W(s}h^nDM++l(~3;=SQX=
zqda_#{t&JgzcLvP6yIDt1}MM>Mf}H;enj3el4Dgi7#}b30c}ho_~%lRHL!|-sZ>g;
zkm^lb$At5*>GG5eEXc-~y37m?9)UiIxgxU$)b><i*2C9P?-EskOGQN-2|ZaJZChU$
z97T^5o~iea+{RLANfUi*#vr-LE<JFJz=3WSSWO_f91}7wbT8BH68Y<lH@Pbsl$eS0
zgeqxrL;Q^<i1|dQ<wJS22O@3O2o6KIv-QX?h@NG<^Ob=jxREgn&#)|lz4F@~mjCp#
z)~LO1x-8<gfAn7X9yrJ(p0<KX1Jcv?sH{4adEGnMV<3pVlgFE2gv*)xyIMoZ<TOJ)
z_Z7(|6m(3UR{f?#a`}{0<^w}q8h_hc(3`yR?X*=;Wg*@C3zbPm58BzXLYrO`gSj4`
z`lw(v@MO+(xC7}{#<pmi;%z!OelH0nF73#p=0lXWXf--NSfXZ5sfPy>xaauZcZ)(!
zHSC;+darj8ALVOI?V8<)WiCC#5SN@6ixZaZ?cao-@aA>RE#tG6H$i<$MUdQAPt1L`
zt!*pg&qvGQomzX@B?cBXw`*8O=Le`ve=n<lap_g#T^vP9AB<>NzQu}9Qc-5#b&>z@
z*3Toalj&We7^%-rs|U|g>aY}@<sw9^c;bz@u`H(%L%D71;?Q95m%;jvy;;`S3AAPU
zPb-)?wl4OSJ(27*685*np5!#u>&wp!sx~8g9tm4WlO46W`MPgb-fOJN_~zotA<ihD
zmwB;9L>rTWv={$IGNg%=^0&~7Lttq!(cvof@@3y;{0*MxRs_y?M(p8A8u)Gr4DI1B
zI;(4-<VIEOOl%A;T){d$ZK0-;BN=x_-gf5Tg`7L8t!tmHYP6+YIgg#h)qs&s+NL&V
zVkt!XkM`06n(N1_A@a4*IifYB!_2CAgfG?K&8^SKtjg$s<!64d!2o}|O*3nqyKcjW
ze@{~f|C&+Q_Zf`kX}#U8P+axV($$#Y1M&jl3%~gb;6hu+C{32Z)X=7&9lw=aph3EI
zk9cwj%y^rB_Umt^BS5^uAse>QTNC%^mJ&M)Oq&Y?na=0mmJq<8&qZGQutm`hEvZa!
zqU0l_8C<6m3AP!6s}Ip$2<GK)`d=J$#D2J=-ymid{At3Ms8h(%7X^gnC9dDEF%A=E
z)QKSMSB;lkwaQjD3s*-;pK25FA&QlcJVwc-g+A!DeqV3wIJ={t)t!<eRFHqh_okTg
zc-7)9pQ#riwDWWoXjnG6w#30&tYhw3=|hZ+;die}tj|}TCKDbHHBt5;$@mm!xTlnv
zQa>8_1y#>la!7bbrczp6vc%q9LTE?QZ*Jx3*ol$iZ-L6P0V`uI@}Zw)Wt(8CluaE;
zcRYUlFO~~?RkOfSvZ-G=ebMLhV0#!m5dMY6@YkUqc+~Q*q3+=QX6jk>p~dKXTRrB;
z%l$s?d#e@?n(!24qYv@~cOBP%tcgshRMRbMwfriB;4Jm0uT}R?+EOe*O>2{MPYxyx
z<tx9hwmb~h#94l_;_>G%j^a$~0JSceoyF(d9fLMlCJk5l-+pPf`A5(Vdkbx_(tIvS
zVJ9Eu+85LsW@#m@KH4K)`woxFIkgCiL5Ay+CzPlDu6q0#{3S+?HuF#Yl{j=gyTJr$
z56i8e3OIWKWb`yLukG_OCwCsR>TZQOO>a_eBNw3b77lGvoD;r!6>_Kj7N@xh59XA3
zmny^dSN(Cu<YQUCX7P1hv|SJ;gFN(qS7XO`<eV2+-hBxZ1mFG}d0w#F7QNd_hvfA;
zC>ZoPSXs$z<=JT@_<0v(HX4E`=?m){Fc2fJYYRSux$EtUF1+skRsP<exRKDL_+6f2
zPGjBX_|&=R8&l~h&u_Aqp1LLR)=B$n;^evb1fO0g#eNFV6z-UeY0tXwcor*aU;}#a
zQ2FN}(U`~19?CzCE^m!df<X!vNRNzoHu{T(;wK4D)iCqV=SGD|>58>0#3pvCpI;?@
zFiJ}8f}hj;2)dOs0FwDwrT9$h34>j-y&QdW1&e?NsTDL&m^$Q9X=(WU&x%xg`F;i@
zQ_I*z!=(N&jpr$`iK(;0$a!$G48Fq(^#YNzP|t&~t&>?lB>Re+fw3}m>FWvPw(0`h
z<(E??J*v@TvfxLn5#jO|ui1)AKQ-qOy0&I7V)Nk6^SkfTvbyP|x9Ny$Du>35N`HJC
zUsnOcavvNL^Nm^lZ6-!QyNVwXEf=xnmD&*+vFfxu%~FHHHfi_#$lLIuvx;b17LuA|
zBILvaJ}bb<1MyZ5+;k5lvN|3h7ivg<dv0~S>3iW->blyOyR`CNJ_2X>C>VCcXkq`z
zeer1;gN1(}gGgg=*b_P3ss8*__?*lT6ZBIx{r0$)_cpCzZmRz=U%{dH+JR5;Pf2$}
zYrmX@_#Z=bvVsBWj0wU#bTx-e@2TbE#z5MFYdFmhaX+4*F0do1i*s{$kO-veDmb35
zE4)_dIEjq2sqA>yZZ%WKhb$03d(MySGrr(6CT9HXI{>%MuVcP#QI9!;9<Dz$q78j5
zg!p*wSa?RW{sWi~di<8ev7Rs4)y?0fpqJvS5c6@<*{9x96Z7#0>ch_>=e9L8&#me}
zN<N~yF5PN!E|TN<g7F62{K)6|_H?|6<6NmqthJVKU#Bw(RxjQB*XKap{M!180xW}?
zmT?o1GEs!r`-q%wp>+Uzt{ptzY&k7FOj;1({yvp{f0FIC!%#?W%RP$VzE0nSnLmY&
zISHR$oy=JBO}or^vMNPVy-Sk)lGYF}GA66}C&%i(PKt9LBH>uMR}+cH=@}7E3GXJ!
zCKKA=R5q?)q&--f71tNxUa~Wb`K4vrUU#+ug2A<R?@ZCRRKHyMBMbQ%me^ykeN;8&
zQSxZ(4&VAQBG!^t1;VFV?5;l>xCzml$&iF3*G#wIeXBy&mU`E72jDyNp5xn%D*9Ed
zf>Me2SbL2tll42tlOE7_k%YgTE`JfBXQ3w!sanx)6MR%9G?E81n^Eb6iH)56CHe2L
zO9(&@rQl76!BPio0H6~O0N_AX>i}ynxdLtmP6SWl&A>@<SM$a&<D<r+y3Wc_tN-qa
z&Vr${RIam7?`#EXKk`4j$y5{ExtUOPcYN&ZumFH&Y?QpPIPw()+6ATzUw(ldO&Ek^
z)_42Z32C)HeSTzJpi1_`)!Zu24PvZ)Xz4F{v_f&H#$Zo^&`sjb8f|Ym08P&QNSKiX
z5X|y%#GGME5YKXLP}F}qk9=AAy`Inl)NT+OT@`nqb%B7d>6JpyU?OXTsMCOQ%bC%s
zi`ow&pJiTtMWpK)N;L3<@;vO>crdjUby=l@uPujCc_My5zR}XHH}%U9o{2$_xXXLH
zuh#43GGAi7XF0{VrOeV#hU~f%Pz{9mZ7lTqeNHkosjq;Zy8VO4B3<Xpgo@m^Z#8fi
z5EjjvZTo&J=dTiC^}p4->-RErN57>yspId{4t`cR5ew2YbiPiBLqIAsvd}RmCbwL1
z*WlHvsTY)d!w-1Udh7B|$+RVS?6s}VN*c8Hmfb`e%Ljqz=lyzcyo!+m*>K>=?utA>
z=I-OCb<)^{#&{&#53H!P_SgjeQj|jp*2!Ug%x{ZB>!JU47;k#Run8?~&|}qxh~nQg
zG8VLZqd*`ezu;Xf5GW(LON<f$d+_{*GB3}AMSk6DJA!ux5Ofa>vC%4n2vQf*!$6WS
zYZV3kOR2P%r3w^o)@wxTcxTojszg7EDw+#jG)yCZRmrCN9THp=#MY7^sNw?B0#AIu
zwxyr{SwAEDz%C(YtLsz!)jEqESy88n9vIHr$U`P$5s7&l{P#=?6kvU>pU9%hE_B(t
z;v<s>N(xa+<)KzHGor}N7n+|@Q&BAVMD$9%M2BK@e4DP+O!};<`TaWOV{THkW$#}m
zkbxqfo>P9bdc%?Rel~YnId-6$a@$!tlJpYNJKOL!!?3q0t^lihdO3N+mpX0@oXuaG
zY~L@p6;sXIr4VoRTmH955`=^ztbILov7Iz>4J5NU<JPxS^5odGtwK*JJSah$Jk6sd
ztt57GWNY+$$8$OAj~|NC8Ve(^d)Ep9UP;|nX^q2O`cALXZi%p&^-buXf8<*&*@#cB
zc*w$&NN4cQg~z!1tUTwRR@G`l^l#cypyP03kn8`(#q@>LI28v6txlne&7`j7Db%W&
zJf?A+=0X@WFqg$(k~v0gLd}?~V%BUHnizDoP{v@Lh1!4oOehA+n_MkR9gHvAQWt~A
zmJkdoJ~qDbKeoKaL@QIw(!xp~gY{N7VJd4g%-Y@hG1))56l&303lrhDVZ#2vg<9p}
zLb=$GVq5`emje&l#eyo~ArsKi!osG(xfbDW?xm1nt7H=NSC@<aaa}8O|9J{u{NY8t
z;AcUR+0w9Hf1ZTe8k`g8AQzg*{a+Ru3twoWz_#LS*PMT@tA99;`O(GHPz$y<o7%Ny
z!WI`qyM$3v@LO!xhxy+X1^@{DlglBD60u`P#lV>`2P%UzVNZ#mT~eqHQG)+>AZN0i
zj&K|R07wJ?X#P`YOB9`CgsBm0$AmpCfnG|YR_tzJ_P)#`eo>F+i=fXZ@K0WyEav@@
za%3p5{muTN_Doo{C@OmnRGd9Kred`{6SjmrhIn9q8&mOre`o-J@1Kf~!5E^t13iXF
z)M6h-fZnn#J^&#45AjR^wdw%IkZj9rpEILL;b@ZZKO}7xl!D^}45`;&kG~Wb0QiJH
zywpFWMs;*09#o$rE2f+C2U!*B=xT5N-z)1;D-OIU0Vi5=9smyjOa=fzbgwJ@A6Wk3
AJOBUy

diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index 4fd53fc54..df54329f9 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -13,6 +13,7 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.trait.Character;
 import net.citizensnpcs.api.npc.trait.DefaultInstanceFactory;
 import net.citizensnpcs.api.npc.trait.Trait;
+import net.citizensnpcs.api.npc.trait.trait.Inventory;
 import net.citizensnpcs.api.npc.trait.trait.Owner;
 import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
 import net.citizensnpcs.api.npc.trait.trait.Spawned;
@@ -31,7 +32,6 @@ import net.citizensnpcs.npc.CitizensNPCManager;
 import net.citizensnpcs.storage.DatabaseStorage;
 import net.citizensnpcs.storage.Storage;
 import net.citizensnpcs.storage.YamlStorage;
-import net.citizensnpcs.trait.Inventory;
 import net.citizensnpcs.trait.LookClose;
 import net.citizensnpcs.trait.Sneak;
 import net.citizensnpcs.util.Messaging;
diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java
index cbe409634..f473ced6f 100644
--- a/src/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/net/citizensnpcs/npc/CitizensNPC.java
@@ -3,10 +3,10 @@ package net.citizensnpcs.npc;
 import net.citizensnpcs.api.event.NPCDespawnEvent;
 import net.citizensnpcs.api.event.NPCSpawnEvent;
 import net.citizensnpcs.api.npc.AbstractNPC;
+import net.citizensnpcs.api.npc.trait.trait.Inventory;
 import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
 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.minecraft.server.EntityLiving;
diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/net/citizensnpcs/npc/NPCInventory.java
index 877735ab0..bbfc12247 100644
--- a/src/net/citizensnpcs/npc/NPCInventory.java
+++ b/src/net/citizensnpcs/npc/NPCInventory.java
@@ -88,7 +88,7 @@ public class NPCInventory implements IInventory {
             index++;
         }
 
-        npc.getTrait(net.citizensnpcs.trait.Inventory.class).setContents(bukkitItems);
+        npc.getTrait(net.citizensnpcs.api.npc.trait.trait.Inventory.class).setContents(bukkitItems);
     }
 
     @Override
diff --git a/src/net/citizensnpcs/trait/Inventory.java b/src/net/citizensnpcs/trait/Inventory.java
deleted file mode 100644
index 1f154677c..000000000
--- a/src/net/citizensnpcs/trait/Inventory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package net.citizensnpcs.trait;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.citizensnpcs.api.DataKey;
-import net.citizensnpcs.api.exception.NPCLoadException;
-import net.citizensnpcs.api.npc.trait.SaveId;
-import net.citizensnpcs.api.npc.trait.Trait;
-
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-
-@SaveId("inventory")
-public class Inventory extends Trait {
-    private ItemStack[] contents;
-
-    public Inventory() {
-        contents = new ItemStack[36];
-    }
-
-    public Inventory(org.bukkit.inventory.Inventory inventory) {
-        contents = inventory.getContents();
-    }
-
-    public ItemStack[] getContents() {
-        return contents;
-    }
-
-    public void setContents(ItemStack[] contents) {
-        this.contents = contents;
-    }
-
-    @Override
-    public void load(DataKey key) throws NPCLoadException {
-        contents = parseContents(key);
-    }
-
-    @Override
-    public void save(DataKey key) {
-        int slot = 0;
-        for (ItemStack item : contents) {
-            // Clear previous items to avoid conflicts
-            key.removeKey(String.valueOf(slot));
-            if (item != null)
-                saveItem(item, key.getRelative(String.valueOf(slot)));
-            slot++;
-        }
-    }
-
-    private ItemStack[] parseContents(DataKey key) throws NPCLoadException {
-        ItemStack[] contents = new ItemStack[36];
-        for (DataKey slotKey : key.getIntegerSubKeys())
-            contents[Integer.parseInt(slotKey.name())] = getItemStack(slotKey);
-        return contents;
-    }
-
-    private ItemStack getItemStack(DataKey key) throws NPCLoadException {
-        try {
-            ItemStack item = new ItemStack(Material.getMaterial(key.getString("name").toUpperCase().replace('-', '_')),
-                    key.getInt("amount"), (short) key.getLong("data"));
-            if (key.keyExists("enchantments")) {
-                Map<Enchantment, Integer> enchantments = new HashMap<Enchantment, Integer>();
-                for (DataKey subKey : key.getRelative("enchantments").getSubKeys()) {
-                    Enchantment enchantment = Enchantment.getByName(subKey.name().toUpperCase().replace('-', '_'));
-                    if (enchantment != null && enchantment.canEnchantItem(item))
-                        enchantments.put(
-                                enchantment,
-                                subKey.getInt("") <= enchantment.getMaxLevel() ? subKey.getInt("") : enchantment
-                                        .getMaxLevel());
-                }
-                item.addEnchantments(enchantments);
-            }
-            return item;
-        } catch (Exception ex) {
-            throw new NPCLoadException("Invalid item. " + ex.getMessage());
-        }
-    }
-
-    private void saveItem(ItemStack item, DataKey key) {
-        key.setString("name", item.getType().toString());
-        key.setInt("amount", item.getAmount());
-        key.setLong("data", item.getDurability());
-
-        for (Enchantment enchantment : item.getEnchantments().keySet()) {
-            key.getRelative("enchantments").setInt(enchantment.getName().toLowerCase().replace('_', '-'),
-                    item.getEnchantmentLevel(enchantment));
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "Inventory{" + contents + "}";
-    }
-}
\ No newline at end of file