From e8fa292f636077ca3c9ef5d576fc2cc80c1cf16f Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Mon, 5 Sep 2016 20:52:25 -0500 Subject: [PATCH] Verified Leaders will consider Skulls as an item to pass successfully. --- TwosideKeeper.jar | Bin 564062 -> 564054 bytes .../HelperStructures/MonsterDifficulty.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 0c79b01baa9062623c8b805958fdc37889f093e4..1ab6ed8c69aad931d951f1bf48fd900daeb7b94a 100644 GIT binary patch delta 6349 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 QsFDNF;F_C4e_dew5AcCvv;Y7A delta 6354 zcmY+J1yodByMSRB;2<4C3`$CaH24vsNP~cMO1DzdHH38MVQA?tK^g&R5F`YoOF#r9 zqy+U2-`wl}-&yOdSLS69Y@-on5DFffD?@i{RCgG53_ zFhfNkjUrgDCrCRASrm!q;8?t57#I?47#NSh*Y#LDV23+E1#(Yf5h2LQmV+1~7!&~+ zx?mESFiVEVtbz%O5tv*=Lu%B>(Ox88#Ee01UUkikfx1J5VWB}AVF+z7vC{sGLEDRc zhl&N`rK%UY3)KrVj%}xX0q0|u#|)U5A%f>QSNG3zUUr@|Zz$70@TcfvY8iPLm&Zx! zShE-7))-!p8Y^xQ>5RzKw$ablX|JD&s>Ng7Fs>S^ZcZ(&jF%->K?L1$(A;>2I9X90@@)f-Ma;TxKr}pm7HA z<4yAmtE8LWe#>%iMdIJdt!C3aKNHcJb#!#AIrg?b-a&pXut5-s`D}eGu*q?5V6aKn zt=(0jsg8c-p?~yKFOy~P{33JL#?kpILn6hzulS8tq=mP`-P?q0y6U@=^@PET_H-K$ zbMS-lSXs@<+#4m{SW1`GtlZzc9rsq(dqm`Zi${H=#M~V|3jR;8UIXDw#hK3RJ!KIm zD)(V)8oigSMp1(ZT^VGg-<-BnT;v2hMa)@fLE5_ti)fe=!HY=s3;s?$2ljeK3Suq; z;#Sl5&}ZT;JXs7LaOsJ+dh!?W3Rb#rn_csh8L_nfbzZ(-(yI3t-VZ5pWe~7=lIoY2 z!L3;fipuL7N{xq{3n!^m@4^Ct*UoGeI5bHv=csw=qBDi8}uT?Rm-2feh@IZ(H& zS!714nG+CuG&PoWu=zDT=w+Xqd4J8GCo}j3@R&3vRp-pqf{?0i`iqp! zdVpUJ8&@MoYQp8No>8b(bn&7_tBWm#6l``)=Kc_iD7);w;8CE4LVy8dtB%G7G4di9 zPG5u=xKd&hK9MCi*()- zq9O;5pcRBV5^Gg$ixVREp3c9B;qb;jEh?!BPP}6qf~7Wj7~rt&<}UYYFYSr$(H6Z{ z!>?A;Yv)A!5PaOap@&g);zBZHUTd$|$W-f95Q9ZfLqR){d|neTbF#FtwG;b(CL@xq za9Cl7q+Dvk{trz&m3_kMR1bFpB$Ivj*X^eUik{ydXJ zeD#Vn?oTu3K@YyyM3*P@AU>yNin_|kLKeAbpzA4Xm~2+;Ouo{mY!_|v30BNF&L#QD z9WkP3_@%MjfsCHB70>)J=`R=CFL%?&2l%f)_KsYTT3D1;y#R)al=1Z2yzykPJ6 z4r@l|-m7F@h+emK!73e&FGWs_2ZHUc0fgVP0R;SlxI14kQCZS2fJ4vETIp%{pW)sb z7{2evZO0=acAjf6QuK)O*S&7nJTAI06IZ#h0bs zZBHiBs408nk{G-aOuCLCrJU9b=O~2cF`*0IR<4MrrV5R$Ott&$Z1XoL{`hL}?)5}5 z1*crt!gkfm*`J^0s5SfTw}cOH5X$O=v7%PNaMzy@!h^g8Ky5L8SDb&t` z6!k~mi?NMvq)5&wf`4q(&z>-MrF?b0XEr&EYs`L|1ztk%3eQC1D9>FRguOsC3h6yd zI8i|&Bi9bR0!LlnMTAf{R%wtt4G8+}LK=M>xY|!|_a1q`Bgo1fjiztx^F3r&`WZSv|Y1 zJH@(1h}q$%ONCWO?GF`49_oFkaueAIY#pa+;_1?rljGz%OZNJyTTM>PCW2ETm_ z{#FZOrBYYJXR1rD-QX&(E|g%-<6BL*U_+FZ!h&h|e4qB6;^(l=#%#t@O2=4tft*xg zO>VDnn&Wa4ido|5lQ*ph?&q#W$0hqp=UCa|WJ{b?}}Pk8z&N-KEGYG2N(Qu z3y-E}`+W0v=x@E+3ipNGTA1BQ??zp7&{KOu4b0euXW$)sTKX|%HMPr-pFiMHX6hTQavAV;=}mAD~0p>voS z!DSqaJJ2$3Rqc<1m=v(i+UM)1m#$+i-n7q`A>ZD#GtXchYjiLVW3`57q!&egCVG-W zIiJgHr~LZlO;j=CWlnqrz?cT8fb$?zhzY zo>d?44D>Z*?^boOWK3b}Wl186#H30xHyVa=W-3eJVEoheU56VoMpPg6{MYW!T)61h;7Pp9rkUo5ZjY6T};RqGUETq^rMseZcV1oXWl@hC; zt}Sp*)?37jS-cx3p5x0`t4A(MRu-K;)FxaWXL)TV7JaH#{YEeP+nnj%jo9tpQYqmd z;fr5M6@|7l?`+PC z#dap(Z2nyxuDZuz`sHg5B+dAoqLzSqeL(ZJOP&hnVf>Dn?V$oAQ32TfniA1ND)Hg4 zmQ?D!pjX=V1JEVz$Ik+zKZJ2vxF=YLJiQh4R~Q8d!rm|bDb!w_t^$8tSv#XA{#kUB zdXOu7BxT3@lcT1z-8Se&-7gHKsIT%3uiv$sJG$fuq!~}1W!4kRzVtoX$6bXx@fsZt z9_bQUKM@L<#jVbpV~nZ~eKw`U>u8}+%NJ{LGEx0WC-VWvw^00sdYSW-oqt+OdKIshMPIOucl{N3~^ep+3=IqFXq?PhQV8#7Y?TeY7_@iW%O3k<0 z?d>qh3%gr25@D$?HN0L(rPX^|NKtC>+5QSkekX|tYx<>iNWXJ({h-zN${0Uxl~?-e z-9Vep=zjN+^+Ixsnl*1WQHQ8t<#LayFBkKYqqIHonm_H#Y8+;;*PCFkzA%&B5g)!Sdn2-x5S|D;vR)~P$5eKpwI4YlATO85TIhNSxYbbJnHOypY@_e>Aey+NdcEi zm4ie?5^im6yRP-#W7!th!#aUzx*TKvHu+&!szUz`-L131YpjduykA!&3c1>u4@R;d zI3UFw{-`fg6#>Up41Pla&9x|rg+*2w_Ak#|YYs`@Ts`-sJlDt^@pCntAfWS)$C zQfb;i7g00ZClJN?I}Atl*$~Tjvnd&IS4-??!=~FBj!!fD$GkB^Ia(}WDIa6K%n zqQ}Ob*X@*MmK=kxRbY+5GaG;E`P={GrltOzrNNx@gX5nMi{%Cw z#Sr__;~zF{IHX=SyyyR2)cZ|5P?F=Qu7!~WQ)HH!ifXM7*85#6*wf|UVzCE1zDHKs z^_aYHUP${PC*Ol6;M}1;Vp9p8_CZ6OW>G34NV&#t)e^7FJ;Ok{JdoAW;)hbQlj=K6 zCmVJMQ9U98?}`In6`pv>7cxrPzfgk2&OyiuOL`Fga=Y_sBF19wmD9Rw#%NCyiM4vn z>Vm>Lwo&Z&RfCKppRm`oG}4aN{c|DoWR$#9*HZaI2o=pg(0Kk=54v}*g)@FK5MEOR zJR)f?CY*SmADi(>6?b_sjsIuTb0^uiO&kmOHom$xzOy#I#8$p)mcF=eI-W7HFIDs- zT3opsWWy^i!8r1rxWsCDR)qm(M~px^}s%vwH% z^L}+XqpZcC%Aek=TAKB{gBM++&_tMJxwB7ZK{@dKUP)xh$6hLs{S`G-(=$>U*SGV4 zESA6ntNd!cKu@pUH_ND)lT}(V*56nSLFHC)G%~dzi)<{CN!snaVlS@0?0oh)Pwv_5 zlGReLT9X)GG_p!XGtb}k5QpUgc4v2%dZ65tY}qoxKRV*)9f!D;sT`*_^}nzze$z)5 zc&3m39xY$vwe2yXq5j?fgbhdS4+B9Wu1tP4J@;E*rdX3Ml`2GPzr z?>L!3mE&DC<0lpi>po>?3}wqr}9+%h1%; zqMI+D>;8#9J*}4g1ODxYj)IYPclQwfz1(DR5AsuF%slLII11v~Srao^4TuzFU~{1j zs*!F2-Pvkc9>?qWb?N(L^Lb%a;WaU*&uMq0z&DNAhY9NWTvcOzr3R1J2ROoOwN0{1 zM*=Q!l2cmq)a>i53RMg5PO!P_8rZjFFuqa4Xi1aNX_!@@ur7HZ%UO{vs_^46hm0db z;)48QrO4+uVhV18G})ygvU)vd`J`^ONYcBm8phmRJEU&>GK9Y@V))u%xSx~nm2Zl) z80)GAi*FLOytFzBf4YfA5GxnT-{HhO>P1(AOIOG0VrsV2_?bD_}^DykSX}l1F(V| zl7bT+s9-)aC@Dytf(j1w1n3~)6lgu_2?$|^f|y=_4P+ONcAT_OGO*MO;Dr39``4s- z0}>DXnEcmJg7m(qY0uJc z3@x~liK@xd7vP7~X8twQ;L=S@RnA{S0t)$|=8-AJYA5g_C zym`9|E>uFvLEUhG1T6Lk;Fwupw?AMCNp1&8{Q+ihxE)G@9<>fYjXHxt0e}OAFJ0_bVtdI&bS5N<#3THm_cz1Bid2n#LW7s(g-5i_bW|v67um0HoUD1aB-vAsiE*KDn)P|tVN(eS3coB@6q$TFY+y)4{~Ks5B-z*Ghrm_kvYkc|ce3NUTJx=>UqX93#% z6NU=dC_+Qp4fK|x;p7H{E771Hjsn}78{hydZ{Sru8h{8u0J6}C2CEz3Z9&8H7Hj|< zjzBGByd7=mBT>V5yU^fw1I)c>FzrRf{`+}2ibU-|*#KILM4@6zM$nLa10v&SIJ^PT zDKtEZ1_Utc!N6$15JEH$21TR#gd2k@GHV$PmNx*bqoMl-bT`pJ7mMl%H>e(q>WTkX zw3|aY2+lqlgyT@qb%KW9C)l_kG7hz*g;TWojvB^10~zB{`CM1%a!TV-DOi8d@bC|6 zWdsSR6k}YlI|j zMw|DR06CZtiF%?aCZQVk4UX1vNvLxA!LB4!CxjT#PA(Z$&N&kr@^7G(0}a2E0T~FJ zFd9};0DRC%7>5juNen+==+0YR*g zHQeMQCOF8N4oG9kZ=%6t6PNPl7?Xe%=>Qx{?i#IYA*i05rUU#~lz;xq=pa!h2m<^& z4=M%@b|O*t(Z>F3$U*81R180WHl_e7CNKjPLxlfdG3xjLF8VXNLkN%%{^#kkPWU&9 R3>3=*C~?g7Q2$?G{102&aJ2vc diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java b/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java index aec72d3..8d276cd 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/MonsterDifficulty.java @@ -94,7 +94,7 @@ public enum MonsterDifficulty { public void KeepRollingForBosses(boolean isBoss, List droplist, ItemStack goodie, Chests chest, Player damager) { int roll=0; - while (isBoss && !GenericFunctions.isEquip(goodie) && roll<50) { + while (isBoss && !isValidSetItem(goodie) && roll<50) { goodie=chest.getSingleDrop(damager); ModifyAndAddDropToList(droplist,goodie,damager); roll++;