From 2babc66a856ed90894d437afac2494ca10b2bc6d Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sat, 2 Nov 2013 00:11:32 -0700
Subject: [PATCH] Fix Ranged Weapons so they only have their bonuses applied
 when using their ranged properties. (Such as only when you shoot arrows with
 bows)

---
 .../bin/me/kaZep/Base/PlayerListener.class    | Bin 204368 -> 204390 bytes
 .../src/me/kaZep/Base/PlayerListener.java     |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class
index 9b4fe4fd9b5dbedc77a8e04a74fcc5fda23bf0a2..4934650cb8e1a6164fa6701f8f4d703fd4500f40 100644
GIT binary patch
delta 1581
zcmYk+Yfw~W7zgn897K%W1Dfgo5nXoo?EQAmF6?s7mdqq-+GHlET~x%oh)S-PG|?7s
zjTU(g7rc~~qLPvqbVVVxps|?-v72dPH@j$dW3psWYi(nu_tXD<pJ(3Z_vvY=*M48G
zEv@CM+mnZNWm?vgvEZ_3Z9A9RkDC{1?8RHU?{^&&`q%MWICeN`d6h6M+TM#V;kt41
z;iTl<Tv;>(eok`ozF3!%5~)nt5&0^OH}ffrBRxdEoVywc8TquxQkj1y@{7dxwF{%}
z{dZcJS0^ms*!#lZ|6l96?)-0z6v;R7BjQu4;!`eniN0v(w{#ExiXpn27@FQ2kEUng
zvGk`fEPWw{r&r*K^yA1)zlgl_c8t=eVYL214AJM}8U523qo0bg`VhwJ%TS;{hY5xh
zOf>Yt6oV5}4gE3AFbUHQGf`-$!wf?`ii`qg8@r>}2+T32VXo1Rc}4~E!^V6pFiyjB
z#zR<Wti>XcM~Rq-C88E#u?LokZY&pvVud&XE5*rJB|eMQ;&WIdZp6!CCCbEISSudK
zI`JK>7q4N1NrR0h7hW|zj&-Jqs4z`IrKt#8Oy$^Wiej7T0$ww<qtYzkO>-8)yUjV+
zV=lyA^A1#-FJZq$hXa;zsIhFqAxjGmTT^hv>PM|L8%M4Cam@NQqBbK=*vvR-bD_Z|
z;gqdEPTL;C8CwYN+7{zITN4^>XVGNujkESX_`q(!hjt5^?KwDSFGPzyg!A?ed}O~H
z#>bAAalx?`pF3)C(b0%Yj_dfs(T2-T4z12iTyX~RrE?6vaxTU<&aL>?c@p0_FXMaX
zZT#rc;hHNOKe@)^hU*1fah2mY*Eam_+J`pRQQUO3;7@l?{N>KWEq6XT+{L)<F2x;p
z74Ev<#^3Jn9bz6voF|vMct%m8XDlUo#?yVCS(NN4A&qAzX+6~>cy3aP=N6?(kI?<n
zqtsIxLA|BXMA97UBb8B_w2S&md#Imug!Ix0GDx41D7BJF`jISB8(F0evdMO`%Pw-r
zK61)=<dR2|J1iHFM_xvfyfRj(AfLRQGUPp!DYuX!-yl_PqoCJ94|<2tL*D6>?Oj8v
zcRLO6?w}lR6%F)Wq(R;e8tm&!Lwwnk<IAOCzL#jYZ!?YX)l;tT4;q;v(ddj2J(+Qk
zp33-v#$=jlY~~~ym${n4`I#GNyq{5lKY=Fr7tmz?BAVh4(=`8bD)g_X8UEL)$lpXW
z{mnEh(1&IR`cZM9h(dwcG&eAx76hKBg@MhqC{Rz&2bySc))Q2cl}AgmzN8gd?X*&1
zv`VqkYQ;}$l!5e;GJ?vK0(wO$rgh5FFs)bC(ne)FZBlBeTxp=qN;6d`tyHP}LR*zP
zv`tN+*Hj(7u1d61&89ch;j~N5r`>8X?NOJ~UUe;1tJ~=<wT2F;4OF9kNC(v~=#YAy
zj;QTa8|+5Mf}m*7N_D{iod^!1`rt@v2u`9?L0yPW2TQ4mJ-}F(SuAvKWwBnYH;bLv
z@(N`0fAL&l#Pcw33+J<M*;SUHtI@P3pW)}SF1kaSOG0_VX_ly~)m#uZ$5N6ms`*5S
z#L|7b6PoivMJ#D_4Vq@5GL{5g8&|;Avkfd&e~!-)w#4324Jmwruql>$h$mT9ylR@>
znJl`5Zt=dbWgP!OywTAp^o?U2ZQ7sX7{^WR^*F|HOZ!6{<LJ;{jbj{lwO_|EPELCz
zj&WvnV%$ADG48xhjMTwC6*eZdu~gZ`b|<!TN-66uORVT$VGsFNRui{+-|S2op-yYY
d!A`2eqH6~5XL)XZBySMEj;oG-Gl(y~_z$X0;0XW#

delta 1544
zcmXxkdr(wm7zXgO2Z?0&0AlbyUiNx`y`QrSEa$9ZDr)FRCgcT0#S#(m4&G8{7H{EQ
zye^>WSPE)_H*$q^!~~TY$7`9CY2%HebWkUi%4%(g@2_XR_nCKof4z@Rsji+<71byX
zwucUFV^mC6hH+2x)wC<Zdn(3z8=~0Qi0#%BTyia2u3(OZEUV!9``V+}#R}g!o^9^r
z%k0T+4G!JquSj9uvaoI5wr*?;8#c>3TV%JgT(kG7mhJA<IoQI;N^Z!TP4!%1EjLfW
zoacIZ(|I;p!F%&~cKDlpg;Aadl&Wr}!5SqE(O7AyCXLcG(`lGyJ$<05qIAt=%FsNa
z5!!GXsTC<z`yP$azE5MdV<}6UOB1w9DO=k>6LmrKkuHpKbXuCMb5gEuG)>V>q&!_U
zP1PNxd_7Au^uaV!ucF!da4OKNsZejDxgLE6&C_Sme0>Ei&>x_M`j@m=|0gXmD9B@Y
zi<TPnw9L?lmK#RW3PUEXH001K!!%lLD5kZB4YbZsMjH%Ow9#;!N(^^s6VK3QUPoK`
z6xzs-qEdbgmGRkB&aa^z{2|)OU!q<76Do^g>5CXEdG^IfR2eg#_Q!0agE3d=P;4Ys
z#imnr>?%4M+epXag6MdhnQG$V>8rRsbRupq`Haz2XY58_8+CNr$kQ34lj@EA=&Ui9
zzA?_CbH+MqFrKDHlael)!l=m<MVCz7>9R?pE2i;u)s#!uOl@@C^xQ)?%tiFQc{$xO
zAE0J)E&X7=OFx=h=(hO<{bW(o9Scu)Ed%LiOAg($tfc#vee}?Bo*r2q(J$5z`qgTr
z->ie_cWWNqv3jV@`YAoNZlPz^-SmgGj$T+_(@R@2y|Sg!U$#v8+m=tSZ6)-Nt&IM)
zd0N2OTA{G_Mko8b2(}MGh<z|R+eabPJ{d~;TBz(>!P)O3%zh8yf&-C40=f#l5H0it
zgt6!*%tv=&19}LX&{OyfT467ALOl$^1@OXk#0s|&Cp?5vjD$&yf?4bVi<k_n*cUdB
zI0SZa8U%5sf3OTru^92<CM1Y;ki?si#oKT@!qLm&L~lnr`Zx+9JBrcYu?8uQ5)5#h
z!$8MF3~~k|)oDbEvp3S5b1}?WgyGH#q&x56!+2n1d=^H<mt%DNHH=LNLsmi>#w8TM
zGd^K4CM2{XJK-@VCT3$&;>XBIoQmAU>Bvi5gsF+Ek)L=N(-Kc&x+@4XTyJ5fYXs)F
zMx($r0rOmwu)tM>g{}&G;yR2)Np37oO2(3;CM-|7j}=L+SSdwdm88LH$&NKrFRYV>
zV7-)yjnWhkN~DF@EEQvmRElj<CALc^Q7T<PnRE*~q!#RyUSXFUg55H(M>gVfS;k&D
z75n5&RLWDZUtWlVaxuP?OHn0PqFO$IBXT2-%HQI+d>=LPGn{ZM;B!Zy)~!XITfixI
zADnil;f!0Ig?e{B8ku((rqgt0&YNq*L^08f|M~CI&_3)-R*~Ty(2q5GGMM|!113ma
zt-Kz3mMvg9sgEkJaNC0FnP7E|@)Eb*pF-3=WfSN1r_Sm+<$12upOos;%5z+qKXK|7
zMK)8yY+}N-4QvWm?*9wd1+hWg7JuquIKor}ru?{$6dM`zcA)2pO=p_|MRP3|5x|&R
zRQCcHbF1oZ0Aqfvx*fon+f>Z~jQP3hW&mS;p}G;kSacm2>+24TEx7|DJY>G(HitZ8
z!o?_NUvRrZDq<o;F!}!ryNJz9b-?Oa-;v_8I;`>K9n_>&-|qhGMOHD@n>Uc%sMzg$
JHISXz{2ys=&xim3

diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
index a0eba4b..e6bda72 100644
--- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
+++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
@@ -5955,7 +5955,7 @@ public ItemStack getGoodie() {
 				  //p.sendMessage("No Damage Ticks: "+f.getNoDamageTicks());
 				  ItemStack item = p.getItemInHand();
 				  double critical_chance=0,armor_pen=0,life_steal=0,attack_speed=0,dmg=0;
-				  if (item.getItemMeta()!=null && item.getItemMeta().getLore()!=null && item.getItemMeta().getLore().size()!=0) {
+				  if (item.getType()!=Material.BOW && item.getItemMeta()!=null && item.getItemMeta().getLore()!=null && item.getItemMeta().getLore().size()!=0) { //Make sure this isn't a ranged weapon.
 					  for (int i=0;i<item.getItemMeta().getLore().size();i++) {
 						  if (this.plugin.containsEnchantment(item.getItemMeta().getLore().get(i), "Critical Chance")) {
 							  critical_chance+=this.plugin.getEnchantmentNumb(item.getItemMeta().getLore().get(i));
@@ -6106,7 +6106,7 @@ public ItemStack getGoodie() {
 					  p.getScoreboard().getTeam(p.getName()).setSuffix(healthbar(p.getHealth(),p.getMaxHealth()));
 					  ItemStack item = p.getItemInHand();
 					  double critical_chance=0,armor_pen=0,life_steal=0,attack_speed=0,dmg=0;
-					  if (item.getItemMeta()!=null && item.getItemMeta().getLore()!=null && item.getItemMeta().getLore().size()!=0) {
+					  if (item.getType()==Material.BOW && item.getItemMeta()!=null && item.getItemMeta().getLore()!=null && item.getItemMeta().getLore().size()!=0) { //Make sure we are using a ranged weapon.
 						  for (int i=0;i<item.getItemMeta().getLore().size();i++) {
 							  if (this.plugin.containsEnchantment(item.getItemMeta().getLore().get(i), "Critical Chance")) {
 								  critical_chance+=this.plugin.getEnchantmentNumb(item.getItemMeta().getLore().get(i));