From 4fe8e4fffed2788313431efcd861798065438e58 Mon Sep 17 00:00:00 2001 From: JAWolfe04 Date: Mon, 1 Feb 2016 00:28:14 -0600 Subject: [PATCH] Specified damage tweak to magic only Specified damage tweaks to magic only --- builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar | Bin 6744 -> 6751 bytes ...1.7.10]TerraFirmaPunkTweaks-deobf-1.02.jar | Bin 6517 -> 6525 bytes .../[1.7.10]TerraFirmaPunkTweaks-src-1.02.jar | Bin 4079 -> 4070 bytes .../com/onewolfe/tfptweaks/PlayerHandler.java | 3 +-- 4 files changed, 1 insertion(+), 2 deletions(-) diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar index 02e346efb98df6c61b1cf862d29dd17947e366fb..e35c3fbbfb034a06a4d94b4a7f6b39a07cd96d6c 100644 GIT binary patch delta 1691 zcmV;M24wlzG~YC^$OeCR6IB%cUYm4Cn3fu(5DG0IOZUmvCM7Jkh1%A#7K@-5CzDA# z?PMk-lP>PN;=X}a*;GV-l>^12=Xj34dh{>y9QD4LbRkHAl5_Ijn|b%%_ucOip-!55T9vGH)|yo1@w{|cm#5WSpKPRbH79?7F;tJq6SAbs#)xz% zIi@O>fN}=kErM-ahM{7YW@y$PhVq8SVG$J&yl`O!gUcG#@(kMt@8#4ugJ>H4mYO-N zDdUAKLs!F~p;}T#GgKufr>(S^8&M^7LNzRj{+cx{Wo--6e*0-bcR!bjHx4rd2bJuk zlrd9zDV@&77W+j`NWm?M9CWUD$V9*cOQi=v^=y4g^Dq3F;*d8wE?# zrK41fCa0|r{T@7q0S0f*e%F>Yvnw#@+B5j)Uvqz5X_1P6Lku26ow9m$Q?~3L)GOi$ zj(TwzL$1ByaCn}$P-lAw4{D?|s6|2?CgO{tG-Ty8VZETzXhZ)8Xl@Va$tBj8k6n zkdjAsGiBKGVC|iujNdMGOCzBA%NE<*%2dwGX4O=`-JJb*EM7_|)7U3xDmNki8N?WeTAI0aQ}2HPglSsZydG=!^VFl(^bSYp7US|&yz~tEaVgl?B)^`yJQ@n zhHMd1dl4^jwU-&{?;Aga|KGo|t-Z7Q-pEax;isjJ8MKo{^JSv*+CB-LE;O{HCI2jpz=*?*Ma zXc=`_%WL$a%P>q!wlveAg7rE%)vJH$D&6^Ibo23_i{R3iBaPqElSDJ4+1+##o}Xw@ zhVN(;otN-pCCyjpUtz!T@f1TPNs%(!ZW{vf&DZhpftFdUKS-;(ovzkdY~AVhyRV_? zX9Q*unZc2k>eLOyNGRUon#Eqf>pJ#d$KyLI?3Lf;JK#I$ub9O#dr1497!!Y!m1DCw z!S_%7icKf3L2;GeM0ytbaSpZIhT2CEcGKORK|jGEFh$UOWxyoBZkp-Ck3f5=M`m%F zG^?Q?hYiF=4Nj4yMN(Jnk9U#Awe+-(r2Qnfo+LJ4E9%gMdbCkH4-=cav4!-ul8x>7 zo-}H~{-uWs0c8TJ1=I-GB%pswpf3~PYLUMx@LVZi!r>1y1f-1S0b=ci-_bRLZd$!^ z4R2mWj8Z4hF&bQJlNoqwivHHaVEj5nic`^owgfHpz zEB2n7#%6M<6^)bv`w$@VLbfAru)pcyR>(8>st7q%gj`PtUlPw=#5y~^@LfK49#zfu zlHPk-k!A?u}e^5&Y2+aLv_9X@Y0AI84 z495!z%>8EeB?bThUz5NXX#)BTlMf9mlL{ITlV%wj0dSLn8B_vs5|a-N8I$lCL?odV l003=cZEs{QX>Mk3P)h{{000003;+xOasvPW*A@T(005%8H^~41 delta 1664 zcmV-`27meAG}tt-$OeB`6IT@e9t6h30VygPQNW!|CLtjSL`6U;SX{AKZEZT4OkiL# z6O#!`YxjMzySBD&ZPoVIdK7!wb9zpH?P>p|w)f41#aIwA=j6?s_wIM!ch@(6{`2ea z09x@A!#2fCNv5Grn0iu`tYq4nQ01|#bX1q8)J&gjBy=?+fH8kmjLPG(q|3&zbR<5i zDwcp^hRXW{Teu8E>2A%?ti24y^$kNJN+EdQ!U_hLHKJu1b_^`#)F^{!8vT} ziL8`N=@Jo1nTCI(W5hXE8qCGBN=A#T4vJy-VTY!RqCWbPbF{zHU zM`D!Qq56eYM;EhZ7g{`MhD7C|p3TWR)xp~Ofx@DSHk=mWM=LLw07H4+vS3@p7vvse z{UX{Ba#MfU!n5x5`F)|-l!$g-XjSN#*@(3IgRL=z(y#tBFT~y0!}qB$>z5i|0sFWQ zY!-A**cYQZtS&Hf!p!Ii=_DV?&~Eg&(S`jFgl(RffZjQ^0iVA$Hcq|7@kY+lbm=(N zqRHLXhkiGn#6bp6#$Iblo9Pu8aP1xV>+hMaG!K6w;0S};P$#Wk-IOi62la|LhT|R_ z#h|M*5D3gVuC=`_#Df|v3~JsXjwhn?qBLk_G-Ej0+spkqgp(fP_RMUY!hT=aAB#^h z>{_&f`VHP0%*d8sQ%LVHn%d7G1F-^(Qh|r?}Eik31u4l<&-?E65Hs*Zy{Y9 zr!0{M>_=ZNW6j+^q2*x(OfU#CT~;~nDMo)OJ%tzDn8Zu2uIm8rDmI>B)1tX7;uXBg zaj&_$`)pj+%w-e`{pJFkT~v$bKVXt_mLP zN408}5Y=jrnNWF?HWgVPk~5kd*VPkzpbL0_G#<{S;%X+pQf3$1Avv9Y_Z}xYT1p+# zvKlRP8HQ=emS!4MupTF4dNp08JHLO3Za)5V@!SM`dg6O}ljzClS<-k9?w@H=gdb=W zoke)ClAbr{Uuv(crcp#0NfDUsuoVH>raM@3sCgP24%4ir!?kM~+d4|TCAZP|3w+ZE zUc#~Fio{(+NGRIunntJBbq5FT;Hi#Md**dj9;!U-EuF>*dq`G3Ju1e_MyG#qitnHK z4Rxn(Lva<~LvkAWNlvxcrrJjo_R!s(LO;@G`{3p$(1C(qKSO@)tob`9DTDc*hi*+O=sS)_eyAN z#u_rB7Cv;)_fRJpbJIq%&H|d3@J*g(B2TlHj=d&cxQg|BQhEL2Wt25H*;CH)S|N+t zSr)a#;=4SHa*_celu7NVArAS|YYI;P(N4vZ{{T=+2MGBgxUL=s002`BlTZO1vlI=g z3kmrlxUL=s002{y#~5h=^OG?dRsv}dlWqYSlcf+4lLi?OlfoGq0cw-o8D0UJlRO$7 K2GAA&0000_bs4Jw diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.02.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.02.jar index ac11f172052c3fbe54dff0a08ac08147ebd282ab..21a33f49d5e45342d1e6f57bf4af72556eab834d 100644 GIT binary patch delta 1848 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 Z1Ya#n{DYwlR~P7Ec)}4!)@2T#{RdYHLty{_ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.02.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.02.jar index 391ef36f58cfedeb2380cac8701037a17f6c7f49..cbe861744968b6967f423bc27336a9b883585b67 100644 GIT binary patch delta 821 zcmV-51IqmGALbtoP)h>@3IG5I2mr_eL6Hq61IPkFu{N><5fB1FNP_o(ZKMJK02T)T z04bBN0~(XR4ibNrRBdb9FcAKnK>owg4@K@Wkrc)lS;p3v(7<42?H^F=bE;OBJXua! z%KrOKmgCr_X;(-r>F&9==T6E+{2%8?!n#V^njk(Arzg?W4DHC^H#QBzICMkb-nkh~;nb90KsNEfTRA~84 zxhi5SS9s~Av&K-P<9k?;2jqw05HFk}Gs$D%wZlqrGpVe}OLcK=WoA#x3@3imm z=?lG<@k4)^@4SqLdAU+DhFFQBfI#?FXfuq4&!gesd$-#psZBOUCSdg5DSI&rRQW_? z=e-T~81Ur7Jm{-V%sim!2FQZ6RfpE-_I50q?Hz@TA(YuT!|wP5r;u2a=a?)*SXp?t zjYE%;DQjUk{wakj*s{*RuM2CkYUEfLJRaX+;i7-Ymp6DG`0t>~I6(@2hSU)}7dp^E zL8p_+Y!52XU7$$nf*RRUZ)71?3YoJd*2-|3!O}v0>b7o;Rmrc_J@?{(>uda(hE^v( zY6@9EjN!;uE_rV9qcKeQ>0%6wc_G*M=oZQd$0GO$eNhA_1pmB%4>0AEg+HG9H6+l^ zLTZ2C4r8CVNRp3-J0GcQn%aF z0#X-F=on23o!L4*uBWP~?mo=t(0&UzZ7Fnv67*h{6zuC9PA6e5DoVQAc@KR8pC&E- zn%v%s*(o8^>u1%!H14kIUMEiE(+XMbGNLJgJNIQPB5Xfz?_k@0~wQS4>@3IG5I2mptxK9LP31Ba_Vu{N><5v8R*NZUAjE3E*rK}Y6c5!hob=nV+mRnlr%+i0nkQ99ittj7cnwS^kE(aJ;B}miYRHbt%~s78LET z!{v~NP{Prs*_Tax?$@$51~(1|a>y#6f5{3Q*p04CdZ^`Gn>CNf?)s4dCK}QD!I^vw z;Wzy&tn;9H*@D5+gGT4bPA z8B{^}X;YjRW zwA3yY2_b2z%cC(&=;>k%gm@uU{Lw9>W{xEA5%xt1oS^yV1$=-h zoh*O+_0*rSfNm8+`Eh9TL|K+KgT2+uot)t6gGND`?GJIcv;8PL4({$J@M+RPrpao< zCV}}Jx|@aKD>i~fkZu*R6VF1wL)=}MOD{H0;>(|es&*A2l`eec5}|0B^bQ<-F0!|} z4ucrF{R-0-!CH0(Uy>eBdpPxA!qV{f4^T@31e4AV8nfpIjRXUSt3H!=3^W6Wt3I=? z49@`#rKLVd+cXadp)lduCBll})0lO7K$0=Kufz diff --git a/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java b/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java index 98d63ef..b624c8f 100644 --- a/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java +++ b/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java @@ -5,7 +5,6 @@ import java.util.Random; import com.bioxx.tfc.api.TFCBlocks; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -41,7 +40,7 @@ public class PlayerHandler @SubscribeEvent public void onDamaged(LivingHurtEvent event) { - if(event.ammount <= 20 && event.entity instanceof EntityPlayer) + if(event.entity instanceof EntityPlayer && event.source == DamageSource.magic && event.ammount <= 20) { event.ammount = event.ammount * 50;