From ec257f3b410abe88552099a2a7524e04b10ca28e Mon Sep 17 00:00:00 2001
From: Zeshan Aslam <zeshan12aslam@gmail.com>
Date: Fri, 24 Mar 2017 12:23:24 -0400
Subject: [PATCH] Bug fixes and messages

Added:
- The ability to customize the message when you use /actionhealth
toggle.
Fixed:
- Check if entity is a npc when look is enabled.
- Showing health message when damaging self.
---
 config.yml                                    |  14 ++++++++------
 .../actionhealth/HealthCommand.class          | Bin 3128 -> 3291 bytes
 .../actionhealth/HealthListeners.class        | Bin 4586 -> 4681 bytes
 .../zeshanaslam/actionhealth/LookThread.class | Bin 2575 -> 2644 bytes
 .../actionhealth/SettingsManager.class        | Bin 5302 -> 5583 bytes
 plugin.yml                                    |   2 +-
 .../actionhealth/HealthCommand.java           |   4 ++--
 .../actionhealth/HealthListeners.java         |  15 +++++++++++----
 .../zeshanaslam/actionhealth/LookThread.java  |   2 +-
 .../actionhealth/SettingsManager.java         |  14 ++++++++++++++
 10 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/config.yml b/config.yml
index 7d37126..c6c1a3e 100644
--- a/config.yml
+++ b/config.yml
@@ -3,32 +3,34 @@
 # {health} shows current health of the mob or player.
 # {maxhealth} shows the max health of the mob or player.
 # {usestyle} will use the defined chars.
-
 Health Message: '&7&l{name}: {usestyle}'
 
 # The message the player is sent to the player if they have actionhealth disabled.
 # {name} shows the name of the player.
 Toggle Message: ''
 
-# Strip Name.
+# Message sent to player when player enables actionhealth
+# {name} shows the name of the player.
+On Enable: '&7ActionHealth has been &cenabled&7.'
 
+# Message sent to player when player disables actionhealth
+# {name} shows the name of the player.
+On Disable: '&7ActionHealth has been &cdisabled&7.'
+
+# Strip Name.
 Strip Name: true
 
 # If enabled players with the permission 'ActionHealth.Health' will only see the action health message.
-
 Use Permissions: false
 
 # If set to false player will not see health messages from mobs.
-
 Show Mob: true
 
 # If set to false player will not see health messages from other players.
 
 Show Player: true
-
 # If set to true player will get the message in a delay to get 100% accurate health. Useful for plugins that add damage by reading item lore.
 # This also uses more resources :(
-
 Delay Message: false
 
 # Style Health
diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthCommand.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthCommand.class
index 1db9b004f2e830c23cd8ab35c3f2f549e38075e1..01beaf39173ad130fb736ca4db741a8c3fdac3d7 100644
GIT binary patch
delta 1173
zcmZ{kTTok76o$Wj5^_#XPA`*AlnC`w5h$soV2}bWEe%#GP!+5QRq>P@LuyE966&Q^
z6fN4;s`YroyH=%IFViUvU}v21QD>a-**?`59~@_Vbi{Go8@vsp59i<iTI*kH?^$c_
zGgo>cJpT3XpML?w_|#-0-F~9%(z)5hql{a)Rk0p}UbWt)V0VDq=~J;g4EhZQ4EC7Z
z$z29_tI(jyJ=i*XP1Z2vmqx<CF}T+tsWYq`sQ_X21-Oraw89a;lx9p>GHWoZg8Nm)
zoML@SkXM3&f-#)~2KO60U{b|{CJ%8?v4<5LGI&I1T<1}p$Ig7!s)=FO@Ki)&Ojy)&
zo#4`a_5nMZwlm3SZy}e;B)5;H(g`Q0^SH$m9JZL`Nq3K@EHuee7DqU$bIjstj$1s#
zVfUD)Y5lVn&v8PqrfsN@%4RwoJ6#yA?QzmsJ7MuWCv;qk7npE=^3)kI8Z2JqCAZSs
z*`DNOi&vP^dDY@IUblEd!JF)`c#F3MzJnQi#5rW~4o5BC<)p=XO7Xr@e89Az+WpzH
z*8Sca3&l9DbIRgFKC(E?#}=P3aW+zNQLA6!WbD0Zr`yTr?W7|pFXZe@K5ZAAwsgVC
zWh9Ab)7e}+n{e`is_MAg;H%i#BG8jgVV69DWI1OvZ4XJ-UfuOi+v3A^uGiT==46JP
zmjCm+qrOncV<!@Vm5EgTUuSVw8<XQvdDR4U@(Zf5$or>BE;}XhdTH&DwkB7zW)@Ks
zIfr&;QPU`KrM!Z$0<UC#R<TK1mn^AiqFGupZ?US7)mqrRRMR75hAuZU!d^Gz?-QT7
zBmRV+Um{-;p5h1hJAc{u=9(F_87>Q#%u^<qXRStGxMX$Zl0P)V<#SvSyi&!l5)@fC
z&(#{!G%Zi8Se|&ze<l81wsMND^K@7BpU2Zbi#J$Z#Q5_RMSQ{a(k$YirKZ^z_619q
zZ&$7{N2JJxu&>Cq(*z>HTKA$kC>q_iK<9Wl8^lIxMGtjika{sGpTbER#3>rZX*P+o
zG>da=5#Q1(eq^iWWBX!XJJ6+e9b0I{$2VMHE88ehUHq%plC?>-SoFndSCf#w8{`b-
qoFu!Ej)-jiPC1q^<^lty3vByM{R(bs_?6w7E*9jw7j#O2M%N$o6!5D6

delta 1045
zcmaKqTWnNS6o$WjW~O`3Ia^6eT02hA%FWX0MTVA}QVIwbTIE`50WYV_p&b~f+7|HI
z5mXcuxg1m~a#0g`@dYeXD~XBW#b}HVh6gnv(FdP>cGS4{6ceL~4`=QFUwf^8udM(4
znE14&@YSE6eGatnp-U5;aT@88Jm?a!<RR8uv_Y}ao||mg?6HMzd$(25qj*@+>#~jQ
ziXHaq5tm1KO!BzPbo{s>eTtomj3SWivWb3=1Opyf*6p@&k0PgdLXo!@-8MC-crtDT
zo{|hHh7}_&bJ**$kNp-sZNoE)XC==`o|n9E>H9WE><Vilvzyb5YVKja;I`fVKEFBV
z=lh#Cj|^q={VVrobD3aBQqa7}0nI^P3im{kRR?)l^9qL~uWDZ7u;vH{!ZVR2^Iq4y
z!BN5V6+1_=gZYlY&y5T;Z3=ROen#^qM<vHJ#~BU(h|E`M7HCdzGF%w#+!7FKPVtuH
zZOuEJ){JplQ2kG(+5vyKwl4_swE`LB{k~j~5r`(uyS7$kvcu(^<_zx%>P|*ygg-}H
zs?r>moYkD;yygP$Yd&D~lT_>{CmQiHnee(gRA@Aw3YyJVY4>4_b__Nnn%H948p9oP
zy7d!?`qUMiOXZqY6K^$M!!1M&iZhLchE-2hvxvopnZB~BnU*CiozjfVG9A)9RF{Z`
zKg4^)w_)1N#6?Z&3ld{OhUeX6p{srzXPny;u}PAGNoF|oBw|;I^iB}Hj8~+h@{S_v
zGBFG9EW>iP*1#h1N$zsE$l8Ak&HR6%S!JPB|52KfsTybY7+qJH(|dE2%DJZD=9G4j
zyQf~Cpf23uC9CHZsZUfCNnONCRW?lGIz&GXZ^So-H#{j?!(Y74LIVw=ohC74e#io8
z@evEeHCn}&ED~R{SbWD)ah+x2SK1tp<<4AImY3auG_^Cim;0#T8%ivrjhJ2S-v$`8
zoOZK#n_FS}jF|?l;(lwML91EQX#9A<c$LI0v8|>=`|s?Rbd*^A8{Li+B{mp^wWh>j
F-CuHc%P#-`

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class
index 40bf094262699c6ce6cdff132c8dfea132d3f345..e931fff38972e6c05f98354ea82cf26a246a40aa 100644
GIT binary patch
delta 842
zcmY+CUr3W-6vlt&`=;BR(``++=`3R<l+98rqYO1OwLh8`8f5eblP=6ih)mO&Y2I{E
zeNpID5=2+YP(}*{B{RFQyP&&nyol}##ERZ+vg+pLJ<oH_bDsA-=Ud>zmIvp`%=FrD
z(P!qil@9u2$AAqtAsd~9th6&2!|qrZO5-lW7Dg2P@Nq!g;n!`NsaI7_d3B$r3x1<t
z^IOt+%YxuF=4{@~bl&kYoyFMko~5Z!%0ZLy#d_M9u?C)(rs>vh%%p;rXO!E!L-V-C
z_*@vlJcp|x7-fSnk9&-T#C;C;ev_h|anQMa8f_YVnyhh5;bfE@i+rXi9$`lmuka#C
z`_}O&c8xJ=l0`X-lo>lSF6~m?mJ$x!F$e!?BwObt>#~e+hR;~F+Zud{>~-bpWQJ1S
z^EYtiM(~dlNFb@ff0#Tauu+JxDMG%nl2NR`p~&!NZVUBL$RI)PQ^Zq>nV^JMlrl*f
zGwfrQ11wX{M=DsMQgo_hE7ej!tpur)QtIUd4bn=ZoTo{;XqIcV$Sqps9%p2fv+{^G
zF}NVlxF{2}ON7hvi4OVBm5}_PQ+{z()9KRuT&EIf#-fCCsNo1H%2tG0>M$vz%hYoe
zU1j^?tVuPUjk9`e)Kqau)yHnfIF8UIlPG&=G%C0dXI6H8?r&<$oHWy9#?x$ftkJ?M
z1wYwrrrBe&uW<_Fu%k&l#uG<=iBAn$jVj7+jn=SI(bZR=+^OZ_hVpk)t$C07u3qK6
pPt^_>Ume{Q$+Gx1WG9A^1o!@@<x+2hA*D5}bVt-UMvXCN(;q#Zuu%X2

delta 747
zcmY+C-Ahwp7{Gte&N&{pId!fxHzP2NO3h@J3T3E;seR0xk_8GGYEU6%L8<Aq^s1Zc
z?Z$4pkixu59MV8Y`_Q`5zoLuogCc|8O_+7_@_hcDulMV|?<G%qYQ5ZK#Aeh>fCn~X
zZUz`nJ#jaEOn7k^NvV_BJoNC0scfdT@#*staTeZnyUbCYv=}nNE-QzRd{Pl>Z`Nnl
zgpgYChCDf}Gnc~`<`(1D2~*{JO4PEubM}bGa0jr-0@+k`zM*)M0^v~leT}(LzJ$F>
zV21USv_c?Skz|*!iZjFFw!DIK%+zjw+UPG!;7VX52)@vOj8?d#g~Dc%u#m*(Vuq$n
zOwpPu&+RML=;7^hPBg>alZgtd_qpMse|fr(9h|8mc@bltGS#0~8lRw?Ne=UvN)!=Z
zQpG&gB&g9t)bfGjY*5E0^?aj2EE?qir{o~bQb~(c(<*I5<uYy3OH6LiA@}K&VY+0B
zOEOKjJflYxS7eS}c|*UvWk8m=CL3Ij(*VTC)}SJqIE|&tzoMBIOx@5jt(?Ko;o-E`
z)I|o<UL$o98ab)+Q_@+^Aq>h@&J)E&n>Lq{=LCy)Z&7G-;SUWq?KUyrZ!YqS{acjU
z7BR2SQM38&5>`L*i>pHVw&`6Rb<wq;8HOGl-JAXby0XPB3b?Hob4Pc6mk#c!X8%xq
gCM|uj;Px#t#+v_F1$r_V)vPhi9jAf`_0!+}7e@7)j{pDw

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/LookThread.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/LookThread.class
index bf6e84ec54fde638f00ae70a173258ba9f08d6f9..97d8bb51ca33ca9e311734454fc6e4b139da439f 100644
GIT binary patch
delta 782
zcmXYv+fz<a7{-5le_yTdu%;T5Lo=nb&P6#T5|L9SLgctR=o~7E<Rj-p!ba*JFyqEF
z61gyD+_`XNT$*ufrv3mEc~`l4*84vDdEe(*v)6F+x9HH9zaKsVs~HQBNQs{WwglKp
zX^?Gf4^qYs13MMF{Oo2=5Jh>A3Mx&z*H0DueC!WU%>lz4^l`{&Y7BEYz!7SV=4gOp
z95-_(44hP)3bG6*$zY99)cL44O@o0(Gk99jq-Y)={bWV8h`*v$#uRPByDfHNY6{t!
zB$5^FnhrV@XEbLyr)bf1(XHv>y!+aYtLxQVAYaqRMcJacM8D=T1Bxq}5V;l-xlMD`
z@Yfi$2=DK7IvNKw*SVp&$t}fg%^mJ)?r~r7Kr_Tc&9Jd~#A7$tlN|TNXkGFxJe5_Y
znx{O|JZD7nf>F05Ji)E90&j*q)1H)Iv(sJC*yA)fJ&wiV^zv4x*U4*lI-ByUd%9XW
zn~E}O-9A+xN|4_I7Ph&mRJPP9qzbN(u1tDc&Oqintjw&p*yHn>G{Fcw^XMfKKT)Jh
zw`4(02AR^y-27Hcwq=pMu+#cX7~%45<~^RN2)q{MSyO~rjPk>6_VrnH?oVHFR&tDY
zQS20PHe)Q!oWPzSGCRf_<DFu;#U$}B=i*HmFKKSEzaaEoOn-^VG&%E8ipAuWM9d*q
z3`gX-<grrJlkylBxIvm(MZRca`AUKC=BhLQ!>^HAOXLOBT2ZYNCWr7@{EGFn$eStr
fL!n}WqG&cApJL;jtg#iFL;$~KpGC1u*=+s?pdo`B

delta 694
zcmXYt$xl;J7{!0@b+~=)jj$jhLt8;BT0l^6z@g6KfU|%D4yYATL2*P8tKd8#KBIBT
z%EW~Ufq=L$#wAPR+C=^VmnNo)-!0}P=Y99wbIx~izvcAhq{jb#`~+0<GDwt!Lxfd9
zR<kC=TGoYF&jte<6}1kV*c?K!CB#<h%yFB;c6J2V8Dtl`4YMb}UZbfuOhb@H_8HCo
zAO|>Td`$)pDGrC2!I6A}^+s{jOwGn{OmSRsVsPNIm7SEmijyK&v<UBZ*hR5o;+mNh
zDNboxIjuOOIZK-&scGk&<~$wls2xsT&|IWabBW86qPfCVO()kB*EL;~SxD6u%?-nM
zbJN1#)!y8e?AD~XrMXRyqE~Z=yPA94S3J-><dNpFS@VRa77_QSisWjZ8AG4h_MCpr
z3tWqm{`cXbSDs%UcStoCMC66R!Zzh)vSlu2mf&o+B2ds66K)!w40_4JA)7gJnl4HR
zQo>yMo5}bs`Q{NfZV4U5hhOd{KHwR{Yf)D^hR@;+U)_N~r`6!*JBes+d>DI}tg<|B
zo_CBwixI+aCrby#=_Tg&I#sE0N&QY4KPb;^Pe|@NX;mtmkJr=+KVQ@%(q@Y5p@|AA
zMN`NZ7O*hWcjABFD#_N;a!OS#szt(-<4@x#7N==dEcru?VyU7g9VMVxHYsLXv0Mc3
MJM&U2#AUPcA0rBGNB{r;

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class
index d7f1d5fcf5fabd0acd6904ad7216357eddd3d8a0..7de2460e489d9519324b0cd92500a651e60e4b10 100644
GIT binary patch
delta 2108
zcmZ`(cYG985dLO!$!_)@$q|qi#Zw@GL<lW}CM5(6kU$8%NZce#64=YZ-31Jy2X;k7
zI2BM-6cr077%76H*ibAeVppuFD4^I-KyYS5kw3iq{oXe-?|U=zX6EgNb~`hpJC1MO
z3ZN^EFmWjs>xh}qus9KuaJ!B>OvKkKcZy|+EK9vuhPx7RH<p{Y2lsk$A6A&G-f!Rm
z6D#qcupTn-uqdlUdBnh@f{z(^TyV94HG)qVQ9LQaS_A6@pE6J<__Trbf*TBM6x?Ls
z83UWe;T8%1tQXH=t1Qp!c)`Fn6Pb8Xl6}d*%LZPN%wClnZ8z~6UN^A=Z-}Ee4ZJ1X
zw`JLBAo`97?;6-8yYCs;Eiv8~<pTpBO017kxITNl_yS*=_zGW(^o@>hWpA&6?}Yok
zfgj}HK2d(u@so){?2qSz@@p*G0WS{XX9K?o<&c421%GR9;CBOmi2SF4!zTX1-#U)y
zI9fNCwo#J?cC}UN*oAgDY*pBVr1Gk;Ra)0AE}L{_9n<koEaaKoat@9Y8cnrkT3I!b
zDkrOdC}h<ZRD~l7)8NDodYVLon640lqi{JK9VZk4$JvD<B2A|_MIMURDM67=hN46=
zIb6PNIgv{L$@n^X6)7xKn2Zua^60SbFS0{{s&Kd}SRGc>fRYq0gGDe#Rt9JJ3xlN!
zrJ{SIuA#`WYVD9hnb;cS*{q&&u23#Uv)Ha+Xa1s@MGCfS85s#xP4^G80=B{wvG@kn
zIFA2hZiCB$)e4o8kT2hIrkriB5_`jef$4oCwP){4l^w5m^$)1Ds-?OfHwGn>Pf<fk
z;o>T4M2!`lLrr4+6H<+N)KpP3Y91?3NRPIlR7K~~c{;UJbUyiYx<Ju|)Jh>NuBn5f
z*3?E(8l@BTnVm|ymlStW)RvM6@vP>QC`9Bs$;EcS4wTv<|EOR^g<~sfCv~ily~JF{
zDx2m=Cn<w6`Hs24U?dy~Sus=hMlbSF`{V@b;NzxH7IoB#BXp)NI(1c)P2CjbP<KM(
zGm|kO=s0#+giEZb2lXT<w=u)3{RP3`G=&<8+CXG~9!IsR%Q&B2)LUUDW)afMf`P2r
zc9<(>g?X@aUsSlGDnqtat}q8zD!Q2Z=+swHKkCmTRDY*4U9OelByzlg?r1B_7DMZ_
zoc?ZBC%al{h5e<rUF}aRtA7IJX*nHuI`|x?C2vCE3OU%O{r{hIAB$tlQJr!X4WPWb
zJ-XKuH;@L!_IoqqCebBzEmXed%~v#-3Ked}!dM_Fn})|$Cheo5*n;GO=p_D(08KzL
z^(>K0xQjg5F7h<H$OG&mkFAS5tS)jVUF0Ekk%!Vn9zhrRiL%!K%NnX#;-`9ApAlt|
zpY3Ub5O~1cgFHSia?@Po7P-hT{474#+_iJ5UF6C!YRut=@p=^ycN7Wy{e-qOV<RYI
z3$*bY5w{+my6wI^Et<IjNhzZ@pwBWi$~dL?)?>^nBxa<HWx+L$`!9nPW{h_k6IfWs
zG2;;Bbr-tw+6EppM>1OQKb18<IwBoC&=$F9hoSsoE<p#rNfv6OymdV~A%@Oafi76X
z4mKkj+tCfXk;C8R?l^!Rl#HI#6ul@Ny(t6zC<nQehk-N-gJ>%9X+DO~5)7qPD5TXG
zL7Pxadoh|0VGJF|Sj~&^S_&p;tuRq*k4aibOxChdqD6b6R2zgcZ6u~>C8*GXsM2cS
zX!8)z79prD!3@mhJ9R}oC*Z?8Tn!JW(+t<}E#lariED8k*PJWNSGj??BHf6axc)b@
z(igrHOx1ME*KrGQ49j&aID+<vF;0(S{s7)MA%{*91gWK``%w%@Y?d0I8t*e@eCxZ(
zrIPLfx-Ttb6DF>egKp^)TywFTtg5HDDN1W@b6Jb1fYAie5E@29xkVpylOW_znDi+=
H!{`43)J(sj

delta 1856
zcmY*Z30PEB6#mbff%kZGaRxNk#3=&=L_k4M(-g=LQ<6_`O~ofZ79ALz8ByA%RZH8a
zw9?8}v$QnIOv|#(vc>j&v$8U^w9Qh}&Uu)A&U|zKv)yyf{qMQ6BWpuObo<dwTL9!!
ziHV6=tYe7@4T}>n0oUoc-b7rxa)VfIl;tK5ZpJMMh~ZWfw_&LV%W%8N>Kz8|G_f2j
zB<d~$cZ+h5C@T%zD|nxQ`vo5`@SxyBMii?=c-X*d!AA@{D!9hLTEWK*JTAD-z<L8u
zNWwNL|D*>`VS_AB>)2@E853F9B+YI%@T`I7q_Zt@qUTM#fUPE8#7mOsWdpBB?5nbD
zGZ1}Egx3vh7w;Pe-jo_|iSo9A9a8I^Waj514?e~xCO*YyB7Lso3-Ntv;46v!+Q2um
zai=KX>iEt?IlhnMjq>Rv+Aa@%z>fxgl91gde#RahdtEyAwJoKs)V9EtN%~$Lzv%ci
zw%R>C8o_=-$Jthkl`}8W5Xc!33R$gV8p06;8?}U_lddu=TwiWAD>PuXLIAZ2A=K(P
zpzs^^b54cd@rRB-75>6O9e*qQgF_03afHyJ%(eoNdVjec4qJ7$j(-)7Vo_9K5+)P8
z<HNSU!VWbygu@NNrm(^>g2EJBKrkxngY*66!I=tEMfW&*MZjvcLkiQxlvrxB`hRkT
z>0&g;*>#-DU(r&bQ0-VMBcX<7|M^y<tuR9@QQydUfq?&bbE9g4O$sxmAzzsls6EwQ
zBle_o8=E7or#fbd!y{S!CG}QQolS5%HHb)4<RUk-ttgJ-73pMfa);Cahjz)4mYV7a
zF8@%!LMtUGGRYHL9-kgnl&Gi!d3EwBN}^<)Ix6Z!rztc_Me3)hGj&namAVo1mb~hs
z>T!9By0Z&$tQJ-)G|4Hw<LpMeai$&eR|V_p0=A+a!mcI0gyMizGbbQ7PN!2(Zmu{O
zjD#a0E4R7aj?@Qdg}w2V;-g*+ejgSoI)l#CskfrDC{?F4Md{Q>Q3hqk=IY(@vZycT
zcCKh_lYdMwI7cBUg%U;fmvSMisfJs~=Kj%)xv|Z9-@FLsDaxT-o%jI#X#fvQd#fk!
zG>pkQ<tr+nfrP%XCU?)aRmL8dUPwiRv_7#cPinG>2{ecgZ#6duS_!@SWW<sZd$#RU
zDVk@nq9JsS!a^*Hb@mp}h}anKZg(*uHD>uzViSE?(Fy#N`5`fVJd`Yv44{KNcn<Qk
zImiR%Adi)UJWLKUr4I58Imk2PAdiTH{H8c-9m^W(S>mU3LZ35(MSfN%3=+UM?QG<G
zbdafZkco4UU*IY6%o5u*wlSr=wg9f>i0A(-XjN@<lPb07dJb@5KChe5kJsLCqZ_>F
z&fgwLg&(=R4ni7=k&e;G;K$RK8_Py3$1g+<{|o10CGxNq{W-?~Y(qXiKmm4QAoih<
zyeOhB7)0q9Oqm!)g&0nyD4{Bp((EWk(h`)>GK`{C7)@(1mNue-cA=6Epo)%Syyn3~
zEg6%v-k7XqV~UoGsagT1X@fCC8wpFRL=6^j>-mV|LOyQnLb$nXS6syBckw<G7vmD<
zflrM~5#?BsF2m)B60Trv2-Gn?n5N@O9ajNIutLYxhmd^`lh{_mzhkoLxL=S`+(n0R
zUP4!&DO1$WF4G`v1G+CQb0fyDlT8l0@s7E|X;ig`NP9xL3)eVd*U~UX6GUgza2m?j
Q@Gk2T{2s@=&!m3%A1*R=_y7O^

diff --git a/plugin.yml b/plugin.yml
index e9cd788..7c6f75d 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: ActionHealth
 main: com.zeshanaslam.actionhealth.Main
-version: 3.1.4
+version: 3.1.5
 commands:
   Actionhealth:
     description: Actionhealth main command.
\ No newline at end of file
diff --git a/src/com/zeshanaslam/actionhealth/HealthCommand.java b/src/com/zeshanaslam/actionhealth/HealthCommand.java
index 61a7ea0..cc38381 100644
--- a/src/com/zeshanaslam/actionhealth/HealthCommand.java
+++ b/src/com/zeshanaslam/actionhealth/HealthCommand.java
@@ -39,11 +39,11 @@ public class HealthCommand implements CommandExecutor {
                     if (plugin.toggle.contains(player.getUniqueId())) {
                         plugin.toggle.remove(player.getUniqueId());
 
-                        player.sendMessage(ChatColor.GRAY + "ActionHealth has been " + ChatColor.RED + "enabled" + ChatColor.GRAY + ".");
+                        player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.settingsManager.enableMessage).replace("{name}", player.getName()));
                     } else {
                         plugin.toggle.add(player.getUniqueId());
 
-                        player.sendMessage(ChatColor.GRAY + "ActionHealth has been " + ChatColor.RED + "disabled" + ChatColor.GRAY + ".");
+                        player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.settingsManager.disableMessage).replace("{name}", player.getName()));
                     }
 
                     if (plugin.settingsManager.rememberToggle) {
diff --git a/src/com/zeshanaslam/actionhealth/HealthListeners.java b/src/com/zeshanaslam/actionhealth/HealthListeners.java
index b6b90ef..bea9f15 100644
--- a/src/com/zeshanaslam/actionhealth/HealthListeners.java
+++ b/src/com/zeshanaslam/actionhealth/HealthListeners.java
@@ -39,10 +39,6 @@ public class HealthListeners implements Listener {
 
 
         Entity damaged = event.getEntity();
-        if (event.getDamager().getUniqueId() == damaged.getUniqueId()) {
-            return;
-        }
-
         if (event.getDamager() instanceof Projectile) {
             Projectile projectile = (Projectile) event.getDamager();
 
@@ -60,6 +56,10 @@ public class HealthListeners implements Listener {
                     return;
                 }
 
+                if (player.getUniqueId() == damaged.getUniqueId()) {
+                    return;
+                }
+
                 if (plugin.toggle.contains(player.getUniqueId())) {
                     if (plugin.settingsManager.toggleMessage != null && !plugin.settingsManager.toggleMessage.equals("")) {
                         plugin.healthUtil.sendActionBar(player, plugin.settingsManager.toggleMessage.replace("{name}", player.getName()));
@@ -78,6 +78,10 @@ public class HealthListeners implements Listener {
         if (event.getDamager() instanceof Player) {
             Player player = (Player) event.getDamager();
 
+            if (player.getUniqueId() == damaged.getUniqueId()) {
+                return;
+            }
+
             // Check if the setting 'Show Player' is enabled
             if (event.getEntity() instanceof Player) {
                 if (!plugin.settingsManager.showPlayers) {
@@ -94,6 +98,9 @@ public class HealthListeners implements Listener {
             }
 
             if (plugin.toggle.contains(player.getUniqueId())) {
+                if (plugin.settingsManager.toggleMessage != null && !plugin.settingsManager.toggleMessage.equals("")) {
+                    plugin.healthUtil.sendActionBar(player, plugin.settingsManager.toggleMessage.replace("{name}", player.getName()));
+                }
                 return;
             }
 
diff --git a/src/com/zeshanaslam/actionhealth/LookThread.java b/src/com/zeshanaslam/actionhealth/LookThread.java
index 903c672..a0af10f 100644
--- a/src/com/zeshanaslam/actionhealth/LookThread.java
+++ b/src/com/zeshanaslam/actionhealth/LookThread.java
@@ -37,7 +37,7 @@ public class LookThread extends BukkitRunnable {
                     name = livingEntity.getCustomName();
                 }
 
-                if (!plugin.settingsManager.blacklist.contains(name)) {
+                if (!plugin.settingsManager.blacklist.contains(name) && !livingEntity.hasMetadata("NPC")) {
                     plugin.healthUtil.sendHealth(player, livingEntity, livingEntity.getHealth());
                 }
             }
diff --git a/src/com/zeshanaslam/actionhealth/SettingsManager.java b/src/com/zeshanaslam/actionhealth/SettingsManager.java
index 3b2d685..0091718 100644
--- a/src/com/zeshanaslam/actionhealth/SettingsManager.java
+++ b/src/com/zeshanaslam/actionhealth/SettingsManager.java
@@ -31,6 +31,8 @@ public class SettingsManager {
     public double lookDistance;
     public List<String> blacklist = new ArrayList<>();
     public String toggleMessage;
+    public String enableMessage;
+    public String disableMessage;
 
     public SettingsManager(Main plugin) {
         // Clear settings for reloads
@@ -96,5 +98,17 @@ public class SettingsManager {
         if (plugin.getConfig().contains("Toggle Message")) {
             toggleMessage = plugin.getConfig().getString("Toggle Message");
         }
+
+        if (plugin.getConfig().contains("On Enable")) {
+            enableMessage = plugin.getConfig().getString("On Enable");
+        } else {
+            enableMessage = "&7ActionHealth has been &cenabled&7.";
+        }
+
+        if (plugin.getConfig().contains("On Disable")) {
+            disableMessage = plugin.getConfig().getString("On Disable");
+        } else {
+            disableMessage = "&7ActionHealth has been &cdisabled&7.";
+        }
     }
 }