From 82e380cd3d98b2702a1a8253effb3c0645438132 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 24 Apr 2013 18:22:52 +0200
Subject: [PATCH] these changes fixes a few startup errors related to
 non-attached factions lacking universe.

---
 capes/ally.png                                | Bin 574 -> 0 bytes
 capes/capes.psd                               | Bin 38116 -> 0 bytes
 capes/enemy.png                               | Bin 484 -> 0 bytes
 capes/member.png                              | Bin 588 -> 0 bytes
 capes/neutral.png                             | Bin 437 -> 0 bytes
 capes/peaceful.png                            | Bin 369 -> 0 bytes
 .../massivecraft/factions/entity/Faction.java |  38 ++++++++++--------
 .../massivecraft/factions/entity/UPlayer.java |  18 ++-------
 8 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 capes/ally.png
 delete mode 100644 capes/capes.psd
 delete mode 100644 capes/enemy.png
 delete mode 100644 capes/member.png
 delete mode 100644 capes/neutral.png
 delete mode 100644 capes/peaceful.png

diff --git a/capes/ally.png b/capes/ally.png
deleted file mode 100644
index 83deef32d76fb9a672b987cfb1407959ac6f0a6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;7LS5RCwBylgo0`FcgMA*-k>pg>*^@
z(?Ew#NmuX!yd@6?8&<%EOOrx~Lz|m#vc$2Rl&vMrk;bE=PrrX1srT2`4$o=S)^muz
zG)h&`^S5wv1?>TZ5d;z{0BgaN5=9-mrR4M*gKac?0rQWRpas2Ccr=2jTZ4-oq<;k(
z%b~K~f2L^KqV)|t9+%vH2uSatdm_qu)tLg_K(dng4kqsk_RCIl@LtqJX9?<wA)W=a
zZaYM+P!wBqQBvrP(N)RjPNB9Q;A)8Hd!A0){F*ILMMxk~DK3pB=onsIo-+F+IfIcO
zc(Y36Vhp28!;jCu|KEW0>GYiVXF{^eV9=OLPz`yJ^XL1XvzL8zYs;>T*-AwHf^M%P
zYdgs)@M#WQ$fh*S1dwp?dQ4uX6cQKHvG~4s>stGPofXGTi*GrTH$8^K0iA9elZC9r
z|D!G5;6kjhhwaN7xvcAnR7Sw!Yh{719uf-t!MV;|d07nEJYjtwVziW7W*t(=Q}jhg
z$IG*n7+X4cdS?$R0|yNV-Ry6LP6ekO*vJ8{h!5aENnJ}?HTx@;3NTjJaOqeHbpT6B
zs3JG}D=xDGv{wC~*x8`vA8NRNxtSxl_V@v8m3&oJ$bTr~1^y?%0KFOfmxY?wA^-pY
M07*qoM6N<$f_@ML_y7O^

diff --git a/capes/capes.psd b/capes/capes.psd
deleted file mode 100644
index 7739624e36124020749d800255468774d08c4e99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38116
zcmeHQ2Ygh;)}On(+4LSlhb4rbvL&1Bh7hvZWRpNbLK3P4H@i2<!Zx-f0exaYQ1n?)
z5wQVc!2&jloo3<56H&420};h%!vZL6zjNm9-IlOm`+a_&d&AD1bI#0}ng5)bJLTR%
zRo>7<7{Xm5xTV4`lf)1q$1*HemDkjXP(n!b00AL_MOs36!zeGMYUd>fP7k^8x|O?P
zpD?c2JdDb+Q8s>d$@nh2-Y|!CNm|%8lXYCychA0<B{3PtWldAoN$c!dw%t@c-@!J`
zpVVxaKgXapW{oe6E9olkve+%GOE2lNn61v@u5np<qpgK420ya%vm`W#YtFbV4GJXF
z>l!3ln}d}U<jM2oxdv&WLZVdUDU|X;c|nduE|seCrA7G)X|7CFERz?@R1)u%RT>Ar
z5{I$1xUoX#O%SMYS?w;Dy*NL=v$Hd=Q;}zLwB^gxYIVL;o-dc@LWo@FJgZCJm1}hl
z<&^MxDp;q%VY0hSHmd~n>RW7X*SM@KOvrb6OJ=eA60$n;XesjyHcNh&-kvYZlji$0
zL&Oq5rC94=^)8#E*=94Ba%FF5x4CT2cAH(IZBk06nXE=zr?VtKG_XH)zaF+i?_x{k
zQkg7Qs)B#bQf0BCuvn?i1&>r3po9w<qNC1cG_}qP(jike1H4LUu>w^3bp(VA)dBTs
z)VuWOq$Mz{S5HYkLL2}&txrTNgnzcGFdBR{VRt*sw8D*seAdibSgXqkwIK_x4WpsB
z)#kA1U8Q=v-E1=GvBL8^tVVA&+WC4Z$@d5SqjT*`#FzOXGxCYM8<S5|thJeK4yYlv
zR8f-O6FZ>F{Nfs|w!vX*HJRB`XJb{lq^43^C{q^}=F0PAfocN6{n3R76R)f5x!`>J
zu~_nZYIjaoWd}4#ZxauKjF0JTo@ZzC8(F8#?J%&F9bg3hcJ6JBb#=uxR;NpEHLx`m
zrI4LGlgS7zNTE?dn<^~Q7FEK%Tq9Si3M;fSovu)>RI6yS3XU3pFfCMZh0WkbyYs3w
zg4#-LL8U^eP*oIYWvEsotB`6cwUtt3p-x?)so>QHMD3=w-eH1%SZ@vpgSq}S>U&Vp
zEtzVQ6Z)umd{g8)J=!3f*tx-6zNMN?w1L|74kwGqkIUkr59|UtO&EvPV6onSjjq&y
zog!;2$q(ZCvlSZ6)V<QqjxMJ=AnKX*ceb<EaNR1WiiSF~5~r=z)v0%|nl`Y5@O?d}
zFE~P|Vy>e!oBjm&o%)X72Y!)8RiG*?s#Hm}a@t~wiV8JaU4>4esI1TyR`M158^BjL
zON)x7>SCpme;)lI;1~EGwC4i8-(n5zdTSeNEY0W3#54Xc)z{g3I1ZFwUtc|pAO26*
z7uV{7dp*9R4(TQTu#t?*)aoC;20hzQ(tRX=++yg~p_`#&m{NFtcjNiZvxLf~WA|)!
z)9zOd54FO=e3=w3Z`43>Xw(_uqXvpYqxxe`v6@_^a&KxO?9f<~pjaJjg{h5oLL6mb
zj$By;KNbAcIWR-Wkrx%f4|uAA9Hl}EKN<LeuTtd5)rC0<sVqk!Q^8N2qm;u>AqO7l
zDU!ku!WJQ|1UdW^1q%7t0<B7?DOYKWwDKaITBX)$baIulNTDn*R7oq!i@X^R%9%IY
zf0!MxU8XbG0ZO{t0dl#)U=z&RSTuuBRsgb8)L`mj&C@GPFjR5kgIEqV(xafqh%@{V
zWq^o3Vt^ntVi01ALRDcwPJvWiD5WmcQjtu~xpK<kTm|rzGA>L(4#p~?F4QR07I44?
zPJv1(r7qMa_@OSrh1xGtfNh`);lWj-tAdc=Vp<BY6m&5a1y~Te5Eon;7wo4%Rsd3T
zA-CXioFeL1p{s^`f=k1wmEbRuBfki24P3Cu0+||gqKk3WDvYaEVHhwjbk#JBT1Ne-
zO-;3_)tI81>QrM+V6s=316G>@mY!3XQ<S61QRe_OGFgsHo+DG_$O>}6iXo7!C<jbl
z4q>4oKs$gYqJ-80#t!WQ%zZ2xaz$lfrJ_JCS4g!Qxw>3hu25<;nu^Lwsjk3Vqd_$m
z*2X!@hiN#h0p$A@0lE!Xe51KP(&M+YKT>Omu1F#wfP^O_aD~SwL>hrB1d#A#1g`M-
zgh(TBg#Z$sjKCEhpAcyTt`I=NlM%SW;}ar{z!d^WcrpT4czi;n5x7DC2~S4g3Xe~S
zGy+!$AmPafT;cHvkw)MO0VF&bfh#;dA<_t3A%KJ@BXEVsCqx>7D+G}6WCX78_=HF!
zaD@O8o{Yd19-k0t1g;Q3!jloW!s8PnjldNGNO&>=S9p9vq!GA600~b<;0ljVh%^FM
z2q59f2wdUu36VzN3IQZM8G$Q2J|WTwTp@sjCnIo$$0tM@fhz=%@MHw8@c4vCBXETP
z5}u5}6&{}uX#}niK*Ez@;fnKrR?k}DTl!A;Xdb`17k<NikxyowTngXxGyI)?kw2Wu
zlBi3a@s|<$9l!8fN+u>WJM>m3e1FMW4fD7!{CiQ!AaD~&GjR|-u@Wb-!`(qx@EgcH
zua56%NYL)_P#+;ihSQ;>G@dE|rwnwH4y00gx&X~(qK}?Q>ApUCBrV~Ol#Zn?I9wVd
zQYamVDbPzm!ycjjYLegD3KBE8V#;B>oK?54@NwiIVaQBy`7oGohUEG=ROin?6F>k;
z($gh8gyNng9?$QQQ7lk39KS$l=|pf616(oG1&4-^QcA?YMQO}EmI!f4qZ}?g;srcG
z8Ta$X#(E~iUl;w56dVNyV|n8s&+0at;f5zf#I)$0>?FN~ZLXZ&40IHk0v5u8ec&aA
zgAc4mXMM|T15n=DX*9TGK+$xX;m`uJ&Dw^6@v3E8U4eAD%VzP?XhEd0t(})=0x5RF
zXZNggs=3w)6cdzA6qNxx4Svy-sHq6h9o^=zx$QwLv5kHm&05_Sh?7v+gxa~!oq<l&
zyIr;_*2+5YQ)6Hd{7l&!IF1X99F){p+9YuMv&%1pa|*n`d%?x33Fg!}+xW`i!ie=|
zSF^q?C{&Vxg?Mb2tHxQ~Tvyuyhf84K7@i#zIJVv9n6ELL+N|EfCv%0b=GhQ4+Q_!*
z-DVefV>?)ftB2rId3JE{_?9+$9zg)Oshs}uDxUzNkV!TxVjb(U+3VddC(9cK%Hqsm
zNZq&zEjAYzR5yM+RC{|!aN1f%qArpEKf(CJ)X%lEWXi4vQFX1!Y7;=)uvlFVJOyF;
zjG2<?*P)fhLc0Sy*BhMnx+WdA4FV@5NbslxP7`$j<)iO#E#s}+>IR7<Kz1(PRD<0C
zATtdRSYd>7N5H=j{N_%V9r>8+jFvg*7hsFaa6ksZ-v|9|oIi(#;rwOjH(IP<-vZ3D
z-DokQe+T%l?r@{s3v0o@sKdl|g8yysXPey?6Zo-j%&@R}Xp17mEZfBz+QBace}bdA
zQ49VOFsg*M0Dnt>-vtH;VTsmepGT`iGSV<g0w1rbB-L!EnRU5x8{jk<y~7A+y;$se
zD?EL;GGi=~*6kPy%I2J~!hmq$yjZuK{Kv_(&X~+yex5(3pJ!VQeJebNgg5$mEw>Z0
z=_*3{eBkG0uOuXSAt4)g2b3oh?Iqw48WU^CLqL7kSp)b&p4k(SULL0BJHkU!!L?us
zTD1XA2yr_kFgh@>lH5=u{>>2svK5ezoJO{l#Zd?=nF>~BvbI5WTa6}qo{q^HbkInE
zhTj-1Km&R?y9Q7Cn$sj>Rvt;&ok4`(>>{G{cp^OiZjdm(daI3{O0eZk8~g=l_uvOP
zb%Pwi4L}N<Ci+w$+Qw#y!R_eaf{5@IMdC;@$sm2nATpGUgmH(Q6p^u{j8u{dq#j0J
zGsuN7-fAZnc(!(uOUUJ95xJJ!NNy!7$US5YSxeTDC&(u99N9`<Ca;k<$X@ax*+&kN
zugGC?l$?M;K{S)dq%(b)!OSpb3?pY$Oes^z)H03C4CW%Hjj=Lr<`U*g=2~Vcvw~U0
ztYsc&o@TZ(JDEMq`^<jkOXdgWxIidK5M&4j3Wf{v1uB6?Fj3GfxIoY*m@AksSSYw&
zuw1ZO@Q7feV5{IY!Ct{W!B>JKLL!V8W(tQ0bA>9QR#-2bDQp!wgqI4J2$u<03)cys
z5xydPOSn(?weS~_Sd=c3h;l_^Mb)AyB7<nI=u**jq7|YCMH@vsL~n`qiw=uUM<qrL
zh#C`B990uFJ*q9LGip)PvZ(u`HblJ?wKwWu)KRfmoGBh5E)rLZXNYHuFBV@XzDvAb
zyhXf6d_a68Iy$;<^qA;z(e=^#Xjk;2=-Z<oiGDHq&FF*CKgYz!433e<=wfEZSYxh;
zSr+q9%nLDZ#(WWTA~q#<SZr}@eXKEdUhECAYhs^?-5q-{_C#E2+=#ewam{hF<1UX|
z9=9&;rMQpcevFTg&x%*aPmVXmUlzYS{;~L1<M+q^l8}}#IzgLoeu6vU`h*7(wj{it
z@MB_P;_$?>#F>e%#Oo8+CT>ssB=P5@^rXC`nj~Y=f}}f=HYUB9^lfr%@~~u0@`cIs
zlb0nwnY=ss>y+4(;VIe_eafXNcceU>@@~qJ)bvzYYJI9D^}5uDQg@~vN{db#o>rM=
zOk0?CZ`$^>1L?x_q3POmL;98JYtmmzKbRrT7?DwvF+1bhj7KwG&p6yGtye*>slB>-
z-O=m$Ui&hInZq+{GR>JcWImDkPUi961AA+Fv%RnBy{`A0y^r<j->0k(+h<9i^?mmC
zIo?;&x3ce?zBl#V)c50lqJE?MP43s(@9ust_4~SiM*p$>4gHt&f1>{f0|Wy`4`>{4
z@ql{=>>6-n;Glt31MLHEAGm$s*Ml+#l?|Fb=$1h*4El0#`ry*Rrop!iesS=BCA}mX
ziCMB-vO{us$bcc$L)=4F4S9XYiL4P>Q?jneTA%gt(72(hp{+x28M<xg;q1ZLb=j9>
zKb-x+u-IX$VeP|i8}`buW5Y)bpEi8)@J+)Hjp#F?X2kpv50Ch0Wa7y2Bj=7>J@V~Q
z;!&zmb4J}Y>W$HY(aO>7qwg5KdyHUA;TY4HyT<IviGt6gtvRc6-px(O)#P^MKAgKh
zFEg(;?~1%ldEe$|=g-W)DgTxH(^93>EL|i0P?jc}AiF~LjO+*bXt_athx~0tqC%%w
zpxCVVzF<rNTX1*5d&+cWopP~qoAOj)QK6%7UE!BS*+mx>-C6XmDnr$vx=!_~I!axx
zUZ8$X{Y!CSv8(ur;_t@hj-501p|OWbMwGB6Yf27`%NnO2w`$zJQc3AWr7KJKjUO^z
zKYsQ2Ps@gu8O!c3`$98HGh6eB=3Dq8+flxu{Ft^_`w#7w3SmW6#gdBGE7K~cRIaG}
zM3<#&(><&^T&1kKxN1vvRQ1H_o2uWf8CYYeSzB{>LeYeOOxQ6oVPez76%#+L9bN0F
zeWp%OH=*w4x{oFen`E7|sh-r=)ZbkHal?p)xed=w7Ef-Ne8=R^8)c1`G``Z5-ZZP}
zp{AqF<;^!Ve>i326!(;EQ<JBjKXvWYW78_8EuFS+dj9l(On+@gzZs?(n`cJPoI3OV
znMcm6Jnz=?4xX<(f6@8xTrlE-t_yZv*zZE~h0o7Qo~57l<V8^zO}pr!i%#n6^{e$q
zT54MEY&mSu8g4UuWh^t^V*HXF$1Y{RXdTzOwDnNixVD?yzHA@gzO4Oglh(At^!@DW
z+4syoHm82h19Lp)Y3B8o7|TVLr>$w$Io2JvLAEa29{U*kBKy9%#dB|+d)P72aleys
zUf|s9%7DStF84_HRqp*Ar5$&4{M<RU^U1E%E^F7Wd86lDGw+M}y7~8AEV|fm@wQ8b
zTyps(`~RW&$Er)2OIt48wqWRjg$oW|R(08fm&aW`=kkAFA-!Vh6+c}$?aF5s4qSNI
z!UI=TUG?yyq(zQJ?=Bv@_@1jpSDUVW{TjtJw_kI5iE+ulu9aT9?Anvp8Ls=+KV|=1
z{!h>Kt=GSPL*Wf~-zdJ(dgD7cjlb!^rKwBjFFkN`-OU?sk=(N6mY;5&b?eS$1<UTa
zE$%k=ZTptjF5i56_U$*`esV?oioJJ~-?9GA0e4<==drttcfEOc+1=~z8F<gN_Z(ko
zTKV3ps#P0T4`03PUh%yh_kO-+>Y7*XQ{A`r{(kpgd;h5itPkvau<^kiYm3&deQ3Z#
zH#{tO*!}RAkDUL=8;@2zx_Mphx>f5l*I)Y>dCdLTe;>c-@pqn>_{6p+RZp&aYS>eE
zZb;v-WFxb2-p0e5+BfanJY(~orzbqU?U}L9Y<M>B*$18*^4uNI_j>+@7vf%6_=4xf
z`7a*XV&C%h*0!w&w$0l1;r8j<-`+8K$LlXmeCgGfbuVv!Mf1vwua0~5xt+y3pZ=HX
zUz=Vld~M?{<*p6?R{nd#>xHjx++DPL^Bd|np4n5f=Y==Nzq$3Tinm^VyXNiJ_D<Tn
z=bb6<y!Y<;@9ulg_}-!S&F_EzLB|ItKD_LssE?L>obvIqPX>Il`ah%ovwmOUzUTK>
z?BDfi)2AOEFdX>mGv{X~4=(&X@$+S04E|#6A^D-_zSMpB#(&TI@4>I^U!C}R(Ko5z
z-1+UuZ=d?E?7LluryoA}z2ke&57+(J_s0i*D)?#Jk%l9m9JL%hacs%YeSd!N7u7GX
z9G`alixZtEqfahBHR{werzf8N$Yb$%=v*U%js|crkWOhFK@-6X;NW-yXS+B9u7EK#
zj1vW`Ngu*^-t+7uDHC)xI>HDDsfIt|`GzFWV*zJr>mbCpB#BbQcp1cIJRg#UBq1gy
zCN?G^HZ~zOJ}y4BS8_r^a<4w=>Alj^`=ln&%X{O9P?t%Jk55cWOi4;g$w*2{%0MS6
zgNu@SE($zbNNNleCsW8|5kV>=Ol3SD!-9aovx6BAxs1XE42B;@388SJC~<U5Y+O7n
zY6S}!A`tSz6vBuYp+F>viWbL22@@0`OcjcTq{*T*llAFYb1#>RGj3Y-c=^!mUX5E@
z6a|he_GqJrEp0ly|9gW|nYsFjD~DIy+-$7ecCV|j_nT8bWq){b;r6%O2Y%FzxMj^%
zPu;rX?azL?Z^KJ_4<4D?+OcTa{Tp9?=kudQRnyu!7vJ{4rdQtm;#evX2q3p2nx|-S
zl#*s)h%8M6IhdQ39wop0rVPx%*2X=D71=HO9ak*XHuW+%3%(yF#tcLcS8jU~GI4Kj
zW95`W7yGF%3un&32!9qlACLqgO*55@Cqn0F<6|3M_*gaY)}(veH@($GX77LC=#=x;
z3$ymsC))?lKkv2gKd5he?$Tb5JblB&PaJO!I(+=}#KPD5yu0E0T+5Ynwq!>a&OEjL
z)aTzB1}$AOq4$Kvw%(pM4k{Mh_wlLD1$#5*FIcTO{@ux2*Qtlye)GZcRZkxrfA`{_
zXZ>{H&S5XFS?QkTd7oPH5U@M~>q1boSf|NELyW{mT40$-0>kHa@VnsWq&_=@NIy#m
z3DJ@!Qh*A%`FIw136ob>M@EAuhD0-Ibae{XKnc?iM%NgWkQS!D&p(?P=?w!-hmpaI
zosa?Wb1-u1$M$&rViTAp7k3TZ-yli%%_jub8@>1L2XOk%1tWN>X0a4b8&yj96EQ&r
z5w2wXd0Q#)>Cap#^!e#p7laivFmQ%D18WHZ<zNQ+%fSo}EQf&Mbuf7XzivzyFX$gA
z4)l(7le`kyQ5!8bTp{qLg)CUXfghNX|Ke9Qfy1ERFY)_4UmZGtl!y;-raJ~g4Uu02
zgNP0MJ#7H{0Pn?MXPyE-uER-c);ro*R}-xG!RimL?PG65>Rc{u&>DXnceK=Gx84Y1
z>?ujPS;Frq(4MHuVdd#VC~q|S<X<7(?65ld<?c8<%vMK_^yQcJbv_P+jcS-wCC8k`
znXE3>VTQ#pBgREN307O3-sNKH5;f24?+Vybt1!9RS%=2l2D=Qdb~rGN?lL5Yuu+$H
zWxG!gu`RHn;#=sZJ@_h&A-=`}3*g}KV<__O(%|ze6BqT%Vd)h2Jgi0@*B~tU@VNh#
z?hi}LQ*L&%-mMdCtQjHVDhF(X1jy4u<c+K`KpGmm2@W0PwPW=MBwl0Dx3LX+S9{R@
zL&g**OC=hoKOr9S1T1RU0^(4*m&V+wpXbyVjT*B{<8nDnEp8Xf+d-m_qlMiqZ`RSe
z60~NUlhwdhiN1|m4e&@zrPToEU|ZX~0g;!6cGINq0B+d4#6j33T<#7o2*S{}!p$8j
z&7v;cVk>9cL8Hy#O$P&IR=X@_UXE+xuqOg%ReLwY#NLns@4e4i?ubkpMYhS^(rPms
zSx3OuUNkYm;-j9l!MF{ZBuq$9N>}1trWTXg<eJx`MImyD{-AYw17BH5e(sb>HPd<g
z1N3@NGv_7guy<p3yXs(P$z+GN3ds2Cp$~`m8PSO4ar53Yymua*bT7@Lb|$nCrQURF
z@Qg|EDu`DluX=!&?xq^S<gMC=Jzr>))WRldWtWRPWzkpUlqy>-9Bj!~ftgw`=pre!
z7VGr(S{rvPxi?`P<R<Vk++p+bF-~%g)nIlTQ5zmS?duiOy!@H01G+c|93SlyiEFGz
z2#QL)1HE|I4`VA~u^zf@uWqdVc&^^2^P7v9UfN{0&4rE0*V=q~Q|bAW4riss?wY5C
ztw~-N#^Z&s-DsL`gCk4L-h{BHOZLXZ%|$qoJy4X;<eCTO!u9U~<xXs_m}WA%+N)XI
z1@sEAaYaKb59t8JP!-yyCf<IrC#r?QW3ha-!&h5oo%ghQuIyp^ffz_G9(p6K8_vzP
z)HL!5L<6sKdX0|PDFzz;s{>w~&XG;@gmSdTDUCI}ES~n<4K~=ro)=K4BtBO`5=fpT
zPlM+YTW7MGEP8W5BAJvAjAmPt$;cY?j-X~24N&9JpFTwCQ)xA7Brz6e0qhcTZ!9F=
zi!4TB(OXS5jk-qgXJA;3wF0}7pWx?zdIi2?Ks350zFr^@Av#BmwZ}dGpjZ%!?)Ue(
zsy3dBRRz;EcT3sS%aEj(&QVoMc@;bdv^V)W(BL-;c<pFsMCS~8bpZ0{;NMi>G&^+;
zK92|upNm?p|M|_mchP90Z&RQN(2L@?hI$8BS{<;nO6Q{i*my@tBzFfPxywB#xp>sY
znPVnSzu=CuJjf^wt)n`0sM`ty91l#A0sm|og1~+geKQARh5w20IR%kWkJ)X-yx}^P
zh?K*F!9eCv{ydYB@?cnkw87khBP0<vDWpx-)-JD{(sQhHY=N}dX>Sdp4Q70sBnTg8
zy9Lw064Eza4A5@Cj~9;5{8+`{e;0!Py##PE1F>fPJl4?+=hb4hYu;Kq_2dmlBs3qb
zT@Jf9F5LVV_H1|o2VW&g@S=M?4KayookY={gr!4tFN4K7c;tOVL;MPKqwC>S3CJMo
zX|ib%6+TCpceuP`I!bBH4oT4SmcUM}76M_1OUJp?vTgg2q!*5bk;l_`$MJF?57Rcc
zcF6%Mur7M}(d5&|^%T-%FiWObUAmzS4nx^R52cmNeFfJ~k}P^B432fvn>tM{Lp$Gd
zkt&DI9GqR`Km;5E5!R}2@dd4eF}inn4EeLxVSq`{yzpLcH@JMM)*y$wsvLTwSA8t0
zqVK91VZefKsd+7<%3-uZSeo}q7Ky|=rpzJP^e-RQR$0;tcI+l*h!d(KA8g#rSvi>o
zOI0Qa!;*0U+#DhakkD*FnmWED=trj3>1x7z4ZJZzYv?hgxC`o(AG`^I!2$`ELxkbZ
zt>!t6oXgkz_^Bnv*fNgC*ZlZLr8{4haJ+z*ZZH*izXBHSoDQ1bT7%2q$pgR6Xy<A9
z@6Bsj4^|q;<MSHGJGZ=|@doD=X`J<Wd*=|GL4u{FZ79grW?($-I(H;~owlCys)3mW
zwRrFZKDz?T54P2ed8@TLBzSM^aL~aN`Uy-qt-iJu)M^9DRNv}!1=nJO)g^)0IAkQ%
zj`>!;)gjGaQynftPkbG;|6py%fmn1NAJo|CsEnHn<D-{r<Zc&jDv*U{zWIOxDr*9}
z#N>ZVC($%t;_b4!%=`;osO#JsRG{(k4Jwe=laaD5Eg`)gav;gxm~Idd?QP~dzOa0+
z*JN;DpG80xyz+6*ef`-o2%78p8Z2wvf{D?~Y3%Hln>w@0jzW-~LvA=doXf)%$m8J(
z<bmcMbJNlRZzp<<1pOGN!BJj|cc7biSvkBZh`buBqa5$<HglWL^v(K!hIAo{xvN%h
zHu@S^DbIysI@%h2&;&G<7PH&I@w?1r8UFB)k&1wfI8jn#l}PZ89YJt|Xll3P!<sg)
zfX5N{Fv=$Ru*YGe4=)=$kQ^}M4t+o&rxqSVR(K5I3)$m>C`^=S9UYRMyE(0+!NsSJ
zjXQ7%fHARQ2l9gR-c#&AL*ruy@RIaamq~9n>77-uhT@y)k)~Fcw`U0gGsf*?o7(ku
z-<k}mv$y@d5hNO`OXD-<8mrxFgfRN@kAva>H++xR?eMMz(D5AYdztH?UZasVSm-m3
z_Qf!iM3xa+9*7n26L3Q$@Zm6>4wv9gFAQmMn<a#Kk!N|w^uI5<t<8+7<K~?|b^03p
z3(s>2z<;P`C6Fi%#Ce{Hi#6tKv7m^7(OTFJ>?0=8XnYZ&m{>SW##cxhi;nvtD0c~7
ze39;9qP}1WjSc@B8idP&AALt3=K|b}3S;90!XF32cUYV_nc4zBI^MutzB63D*-sC0
z5zIlLjNL8)Nls2C@v9GYyK|DuAO?mAyu$_}T)+vv6HWr!s3hRdA?KY9Vs{t~?<;md
zr{tjHWf((ZS<U`gVGPoL@mb-i&2J43J1c~8@^z99etuSnb2dWqD13RebI-%la<f7e
z2E2ua_!YClD6_4Tg&_~>`QM)v#@y-6KMq#CR_C3S{#9m$YHtqV7MT?S2tn%serymO
zZap9}D}=YL;fl-(=~_;}Q1>r2E7ZCif5lnhd1XYjl519cgDMN)@zb0@-Wg|wbT+}y
z3aQS>tdPz(&v{nZ)Eb!;{y&=)^5ZNRaRtr_v3Z0}cj!nnGTVW<2|r2towFS}#G{iP
zoWA%j#2Nm#+21nTSp!Ob&uj-?2j&({e3{`q0&-nR38~!U>UI|}i6#?S;CM0g4s#lm
zBuGbv-l-jN`&&59je?ns4Zgaf-!)U2e>OwEtNv@xW~K=?8bv+MX3G2^^6zve0E?f^
z(AB;(&1UfP@ZT_-aog>G^Vtl={I@J$M`kksU1T=XZ9fjXsK_2yWRHuQ!Cz>PD`+-D
z*NP&unaFGg4u<f(a`89Z<BH5?Z~*=PW$)(Co6W3(nMq~uN)mb(kim-=llWohce`_v
z1+n>55^(P}n{mT?W%eFtGszhCFFu<g;^eEt&t~u|I5;OO+~3zQpZ&@c{*TTy!)hUd
z@ETBhPFmoQj_`kfs1`BoG=}>V`~<J#ddM-r=+AS1!u_MOpv%dB@|?@xIctNmo&E1m
z&?bhR(O41>FFYo|FAnw(1xLt9;>kV<F0=0OljIZ;mUuiRr^sm%CEV@t>=vE|FEO3+
z5YuU>3MTEFQy$?rX>>Dr@d=M$32vBY{{p^WvLVM${o-MsB5>Z&8Gt?F>FMu`p+Qsk
zzuyo#mKK*QbS!`nO~AkeM7SHW`ylR%mmH@BfTG?9MOjRs&`kdyp{Sq1YQ!mc5di?0
zc^Z78*v~wkou>dV;Y<qD3Bqi@?<9d+ZvT_`4*3~M-m?LnF?5dx@+(8*XdHV}_<qU7
z`*n46#~(`NdlNwJRT~3Vk#xpCJRK<bFCl<Vq81e_PX?Z!gCWk^C(_=^^E1GE)Fbfx
za{S~8&vA0(s3*?z-H~I*em-{W==WbE_4!wafB5l-@4r5D0IC0cdhpPfUw(dI-^WP3
z|KZ2~*|+bLkKTU|skisO^X_}^y|ef2w~l&<=k#vD8(X)Y-c4Rd+0LD>?%4eF_E&fA
zL~8rCEsyWo^~BcgJCJ(*nMc>}-u>A6=UzZ+!(%JAz4X%dRZnh0>d{pXJooH#&#%4r
zF{JLhb;DCnKDA-vZ4Vsv2tCX1S$FzT;kxxJS3r8hkCl<(KLgb9WsNgt8CzNXdChfY
z$4GoxRsGcSFT7y-<O$`JEYVJEXlks}m8vOOP*kebRhFrh3QFcl<w{kdLYAKkq_Aw%
z=rN~rMLDBKjil1-VZ(=y7%_ZU_E0JvERmcZ;*od;6Cg?1ss5f(r}}gL)0x74W5)D9
zorz?8Sz2o9(CqA?scC7HOib)Mq<{Y*{SuQX85<|*m66d)5*J5FaYmn{#H6G?y~IEY
g%c2Ixo{AC14n#^&mY#A#C`icw|KG64=kgr?9}mg;5C8xG

diff --git a/capes/enemy.png b/capes/enemy.png
deleted file mode 100644
index 0e779b36df1689b543800622eea61702fa88ff60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzhDk(0RCwB)luMI>Fc5@$0N=t^xi|N=
z2mk-?@vujaTZ<s_2xNO=P>+OEjiCzWOHXG;v8R*8@rX(5askfgDPKzBpoasnS^>)?
zuvh?51Xv3g1GFvBG>_14r-5yvzr*bY^!+PFaMwMdwyqIl`f^}Huuz?h3gh?*whAV+
z<MURl3ISJ4Trx3Ig|tElwr}8$2X?~{4!%>RVfhP%6Y9VOS=ypN!_Xa}Rx|_}5wwh$
z2Z(>!Q*}?E+qHsFaH~oQb)mf?5A;CT;GuR7ST9Cl;-RBrg(}YaJshmvFm^U0&ocL%
zU9YdkoC8)X#$=NuxO<<~7QIkG_<De;Sj*LW&(joN+PgZz>oq>A%6Tty6?5KD?DvS+
z1+fl^ddw03-E5E+g@Xr!YaIY4794=@vP9)O;FAaZ>~=`l&&eFcH4{r-*oqU_>i+`4
zV|T1MEPsTjc^(9g9GIYzC1*^osj{XuZf7X4q}TU3iVLdU(#M9N_qGxr8@?-i3r=1C
a0t^6?k@hX_i3KPC0000<MNUMnLSTYtAk-27

diff --git a/capes/member.png b/capes/member.png
deleted file mode 100644
index 9b27e576721a8c31e9b0ba588e9f3a22b9e41d4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?ny*JRCwB)l+SOQFcinX20J98S+aK7
zv@TT_CGBB94n0lU|9{zG)3oE(!)Qa&CQTqoVHn#mW6-)I@Sbc72|j%M{D542xy)a8
zPEjY8=>pgB&pNjf`riGBx4kL)v=3S&p|FUBJkOzY%3MHX0uSN=u6<M&oYObX7(Wi*
zzzD-JJHdbs(Y1QWb;c?}AOi&H2Gn90bzY)wP@m5+vR~o*<5%q14ny`_o4LmLpbiMc
z7CRZ@llvJPZCx9@6&t*eBlN`pe(d9pEx{-=#zF{4Au(~L2%`{D_pvtEDkguoz|^^b
z+9)I|j_5u{bQdF8bJzjJd1r!oc#9@sz(KUdCSK#*nLw;1_<f3WrEOOVQ}+V?;TBO6
zH3y4SzzaN#hi9OiL59i<H$Q^gb>W4cE{SLX)(<5-!Oh;o>~sc|Dl=wdZM*l)i-nYp
zz_gf(0|EhVg5P*|`~idhGjyFE1UQ!ah3-l;jtX3EQ+Jp?q&a41mtZ!-b@<EJ64DYZ
z3gav{;AOHf{VX$yG~;F`q#%<vV6KfbZCt_AKVkX77bjp5vl5H6C`GD`l?E#f&QR9W
znCjKmV7nz)aaBSKcvck~m8ty%Z(*z|W0+e1>w?14eu6g!XK7Y~3)}4fziMu-iE0l1
aE5HEgISroUF<{^T0000<MNUMnLSTZTQUePB

diff --git a/capes/neutral.png b/capes/neutral.png
deleted file mode 100644
index 949df649f8d2e84f3cebe6619db2cbc00dd60463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 437
zcmV;m0ZRUfP)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzS4l)cRCwB?l-Z7gKoCU>Y+MpdOn5WI
z`2YXmubBA4qM+c$cq&tl@u{1+NwGA|>7wd3(QdaJX0w_2sPB7e+tz1l<kB>i#bP1O
zIf<g^9cUN^c|M<dzFw~~nM{1agPYIiay%XtHl0p&0RX@rkB8iDHw~UM*H^CVI)$B1
zCj}%)qF{8t-{0Wna;aH+gL%mS=kr;?EQA;XMyZ;n(X%(0LtWRJ(cy5AIF2<Cr9i9I
zN{XTg2a^pj+_B&9|2puh^LD${g)f(jgebO8uBu8i!%~0<z%-0!%n1flN16z1y<Y1*
zk>|NO#u^wRXWd6+mSvgNo3dar#>U85DfnzumZfYq8?_wQWNsTK7|hFn2}(jU*>Sjn
zrhe|mU@#yH{A@6@pII;%Om>9*8w^ZIh*4lH_6=6cykG{lZT|0!4g3io4YnG;f2zNw
f_#XGsj{pMzuqqY%OwdD300000NkvXXu0mjfn)bn5

diff --git a/capes/peaceful.png b/capes/peaceful.png
deleted file mode 100644
index b178813363598a2cce860390d7df7a777d7c0339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz6G=otRCwC7lgo;OKoCW%Rdk_(;6l*<
z|1Q_M_x;G^6m*hFU`S<V3a$n_p1ysnbeC(%-<J#If9ewH^-a^xxwpyc_&5%Q|D<(Y
zO_tU1G);1zrvyPDNs>qyh6-cDWm)u&Th>hAaU3O%W9j=|p@`b|T{kStQvXvF#b=ID
z*LC*}TwT|7t?M{9M?roZH_I|<+x7;@^IVTV41-vwQk%DJo5FBbRh7*1tl~Eju#U`*
z{YyAc(^Q?3Iavd?jO0rc{$+A*nnovt2xy>XeqX>IN*sRN5KuO;!oM{S0e=J{HsWpu
z(<qMY;g4XTQ54-~`y;UbAdm+G^)iDQH4lDv%(GvEpEE{8;7?(xF98Ms@*@So6pZ2&
P00000NkvXXu0mjf@Kv5#

diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java
index c89043e9..da3b2b97 100644
--- a/src/com/massivecraft/factions/entity/Faction.java
+++ b/src/com/massivecraft/factions/entity/Faction.java
@@ -43,11 +43,11 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 	@Override
 	public Faction load(Faction that)
 	{
-		this.tag = that.tag;
+		this.setTag(that.tag);
 		this.setDescription(that.description);
-		this.home = that.home;
+		this.setHome(that.home);
 		this.setPowerBoost(that.powerBoost);
-		this.open = that.open;
+		this.setOpen(that.open);
 		this.setInvitedPlayerIds(that.invitedPlayerIds);
 		this.setRelationWishes(that.relationWish);
 		this.setFlags(that.flagOverrides);
@@ -238,6 +238,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 	public void setHome(PS home)
 	{
 		this.home = home;
+		this.changed();
 	}
 	
 	// -------------------------------------------- //
@@ -255,10 +256,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 	
 	public void setPowerBoost(Double powerBoost)
 	{
-		if (powerBoost == null || powerBoost == 0)
-		{
-			powerBoost = null;
-		}
+		if (powerBoost == null || powerBoost == 0) powerBoost = null;
 		this.powerBoost = powerBoost;
 		this.changed();
 	}
@@ -470,13 +468,16 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 			target.putAll(flags);
 		}
 		
-		Iterator<Entry<FFlag, Boolean>> iter = target.entrySet().iterator();
-		while (iter.hasNext())
+		if (this.attached() && Factions.get().isDatabaseInitialized())
 		{
-			Entry<FFlag, Boolean> entry = iter.next();
-			if (entry.getKey().getDefault(this) == entry.getValue())
+			Iterator<Entry<FFlag, Boolean>> iter = target.entrySet().iterator();
+			while (iter.hasNext())
 			{
-				iter.remove();
+				Entry<FFlag, Boolean> entry = iter.next();
+				if (entry.getKey().getDefault(this) == entry.getValue())
+				{
+					iter.remove();
+				}
 			}
 		}
 		
@@ -542,13 +543,16 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 			}
 		}
 		
-		Iterator<Entry<FPerm, Set<Rel>>> iter = target.entrySet().iterator();
-		while (iter.hasNext())
+		if (this.attached() && Factions.get().isDatabaseInitialized())
 		{
-			Entry<FPerm, Set<Rel>> entry = iter.next();
-			if (entry.getKey().getDefault(this).equals(entry.getValue()))
+			Iterator<Entry<FPerm, Set<Rel>>> iter = target.entrySet().iterator();
+			while (iter.hasNext())
 			{
-				iter.remove();
+				Entry<FPerm, Set<Rel>> entry = iter.next();
+				if (entry.getKey().getDefault(this).equals(entry.getValue()))
+				{
+					iter.remove();
+				}
 			}
 		}
 		
diff --git a/src/com/massivecraft/factions/entity/UPlayer.java b/src/com/massivecraft/factions/entity/UPlayer.java
index 917a5eb5..fb63f713 100644
--- a/src/com/massivecraft/factions/entity/UPlayer.java
+++ b/src/com/massivecraft/factions/entity/UPlayer.java
@@ -20,7 +20,6 @@ import com.massivecraft.mcore.mixin.Mixin;
 import com.massivecraft.mcore.ps.PS;
 import com.massivecraft.mcore.ps.PSFormatSlug;
 import com.massivecraft.mcore.store.SenderEntity;
-import com.massivecraft.mcore.util.MUtil;
 import com.massivecraft.mcore.util.SenderUtil;
 
 
@@ -186,24 +185,18 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
 	// This setter is so long because it search for default/null case and takes care of updating the faction member index 
 	public void setFactionId(String factionId)
 	{
-		// Avoid null input
-		if (factionId == null) factionId = this.getDefaultFactionId();
-		
-		// Get the old value
-		String oldFactionId = this.getFactionId();
-		
-		// Ignore nochange
-		if (factionId.equals(oldFactionId)) return;
+		// Get the raw old value
+		String oldFactionId = this.factionId;
 		
 		// Apply change
-		if (factionId.equals(this.getDefaultFactionId())) factionId = null;
 		this.factionId = factionId;
 		
 		// Next we must be attached and inited
 		if (!this.attached()) return;
-		if (!this.getColl().inited()) return;
 		if (!Factions.get().isDatabaseInitialized()) return;
 		
+		if (oldFactionId == null) oldFactionId = this.getDefaultFactionId();
+		
 		// Update index
 		Faction oldFaction = FactionColls.get().get(this).get(oldFactionId);
 		Faction faction = FactionColls.get().get(this).get(factionId);
@@ -237,7 +230,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
 	
 	public void setRole(Rel role)
 	{
-		if (role == null || MUtil.equals(role, this.getDefaultRole())) role = null;
 		this.role = role;
 		this.changed();
 	}
@@ -328,8 +320,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
 	
 	public void setPower(Double power)
 	{
-		if (power == null || MUtil.equals(power, this.getDefaultPower())) power = null;
-		power = this.getLimitedPower(power);
 		this.power = power;
 		this.changed();
 	}