From 2bfdeacb54fd08b4423b944724948f706935cc74 Mon Sep 17 00:00:00 2001
From: "s.eser" <selimyag.eser@gmail.com>
Date: Tue, 30 Apr 2024 11:41:41 +0200
Subject: [PATCH] updateBonus fix

---
 bin/domain/Box.class | Bin 11774 -> 11934 bytes
 src/domain/Box.java  |  16 ++++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/domain/Box.class b/bin/domain/Box.class
index 142c7d1d8674b07f801cdeaf11ec5c4ebe136fb6..36c4a5b079fb9f5443346d59beb746688cfbac92 100644
GIT binary patch
delta 2646
zcmbW3`%e^C6vxlmMRu88*aZ|su(eeIcR>(Q1XSc%!3PRdrPSgI%kJv3OP7a_woc#n
zp_O`z1!+l0OlTULXs}yDQma2TY1*{?+5Q>*rM1zXdu9f1V@ync@N@5c=FEM3ckbZB
zo|&WCPY)OF06;x{c~d)|R;2+VxDnAtO>8t8Z43wdPPWEI5ORw5o(PNu%A$c-sEkZ7
z6in1^XicLhQpA<C$`mI;u9$V@dNg!Eg&fJ{MmMI5KhtVbJ#H9Buc*}gP6uYWF&meQ
zkha6`$%1uAST9j1Q6y0;u|dLz9w$D7uv!zpYb*8AQccSOzr0f-Q7W-fqD-P(Vv|IL
z#Ab;~i7gUaC8{L0NmNVJNYqMfm)Ie(Q=(2{mqfip1Im3laGM*eu|^EK_Gi{1*n4|>
zHTVtd-O!8;;%67FNBr$7P2G)c4r~>rZa?l3-R>Fv1t;!D$mk1DaPh>M_E@lH4Lb3F
z;<`@7*>xazt-7voB4|{0A$Tm?5+6-)=^<4{#*E4%%9x#z(_Gm0k}_y#a4Z;O{jy@4
zBcbpJ+gIq9w5IAxM23c<!F_>|zA)cBChn%^<8kpvdR|IDy%yr0Cugq{2N0H9&oo3r
zog=hvW3(_rmUX8)5FR;eZs-I;rsW&Mfmolh`l#s1D9DK^8|$cOs^F=I#KnyKBMIe}
z5u@frdO;V{F>)k1rp#akN&2+1X){T(XD@qJbiJ+&V?;-H&MCuK(UE>r(N=b(-$u~1
z<MG(&Fs+%c-xU#0LG}Aeq;k&of%-j>Sie#70m2F^i55C^yW^w7G7Nh9BXP%5fEUDl
z&#G0QAY@x*OF>f6xbS#$Q!dN%H=dDGPUbUZi)MUeuOJ;tI@qnTSTNBT4Ga$lhaEU2
zhP*zUo}cy}MNFUnE3-CRF9$myeHXs+-GZ%Iza-(;Dd_Rh#f2n1lI;Yw$7E;H>P%am
z8LKmEb*@>RIoa_>XQ9LAU3(kqzeW2Tv^+kp{uBdy>t?~dILu92tR1!y55Wom?5D5T
z0DTieblwN(xQFN{570>tK`XUw)OJwYN$n8~LjX@gKMulqjKL*ptH!A_Nu4QbXD|+P
zn1E^;+-;-+HBd`egY?e{wg=Gv02(OTWum*V*M@enP<W1-`I@3Fh^b<zc)9NA{tnaj
z(YDMqv7^M;Hfjr)0g%MZ!)zv!($E$b%_N%~#Z0rwRm=>Vm5P~VlV=)TPIiseDy3+S
zP5zQWJDUR2WaH|^Wqi$do?WViZ`iC+%ndfrDQ2F{^SYvvtkx>#KAUxlSzxnXG2gQ(
zRLosAMTVKfJSEU#rHljBaf70aM16`e67?&_NVG&TMxv!l#tdttX&w)&Y_V3qWu{fW
zsBVFg)+WUmX;mo32y3%qjIb&dV}!LuF-BNhO_Rhb@yK_#xfW9C^>y0Da69e*8^69T
zu>FI54s<-AcMj#BYbv2d!eMG{)MojA1V=XRyy3r%yB4rfq?FX_^c6vyS$M!KbW!0l
z`*nX34qm6{jKi2gE#MtU!5<(M@9`PR;c;E&83J&@3GmP$@-)#`Cl&12L|q#;V+%ce
z6`F7_Eo~pOT~fz`e9_5#k$ITe&Fo<wW%e=y%syt28Dd75Cz*pxWtu0>qW`~X;>t9y
za(|dP$~?t9!+eeT22*Fg#e9ePo}te3#fQv~nHQOtn4dBQ^Jymg&jkF`lgH1OzlSlw
S1b$AxmHf}%BwocYAn#w~%0y5A

delta 2307
zcmcJR+f!Rr6o=PJD1?)f5J<Qd6)l&RK%o>U*FwrgTZ&YItypMGAt6`@7y|Yt=|!!U
zR;k-+DKm`BIKzxH&a{If;%NJ(<4i~2{U`d~7F>Is1oxBUiw}I8^X;`S=XdrVSQ^|s
zsr|mW@e2TWaN)joEp<mKAcFWUwHlMev($W>8LBi=DLPs(RTOIt$yOcaQ5QkYZ84)=
z$24?^1+BTnngNAKD3U0aD3RDLu}7j5trpA^&$PlAJ(WpSF0oglLZVV)pG1|!eu-*{
z8i`to0}^!-^%4ydjS@`~%@PMCS|nN}JQ9b{s-YRHb*#Z!6kl1p(;E@YKA%s6Ke1Vd
z4m>C}t+XFerk5wTV`mC>2%ql8m&KgEl+$LxBM9~(e>5;M5jocr4m1={B1eVC<}7;^
z!I9|c3q=A(-!X)=gzcP|j_`n9amnU#_bF3(N6&K4ab*&3U?vb|`-XU6%WQZPAv-Zu
zUu1N0axBp8j}C>nWB?&6(J9yI33|Fl!^7NnO4#kW1#c-8-f{ofm^VtBjB>?k1eb6)
zTxJUni&OUOoFGDaV!F1FKRjf-O-S6d=V!gGyi;#gdlgSHCLY*#W`&h5BOc9ylj5=6
z6^kfSCi0=qsPe|~fXL3Mc63IrPWG%ayO9{l^UA!5$VgvQbjRpOC`Z02`B?-_J3SGe
zo-&><iN&;hydu`q@{`_2$Q0>zR}$5IC?1plNZ1^CdDjt~i8T8Cq3C)3xKwmQcpTaI
ziRgFaSI#S2j;BHupCR2F1pRP09Eh}y`KP7=Qz>{Gp-9Z@MdlRza`lm85K&)sXEZu9
z3%~?O7x8ZCcTk)0Xbt{Y0I&G5xFy{&whTv09lO@S^F3^>Kr7jbn4@JG^lf{eMw+3H
zcpNeTa2Rw9f*VKZCI#stjnGXA(nT4en-GLHYL8IcMeQ*RK|h{>0UU=57=|m<UZwUr
zwR6<Y;{+^V1nOyS-Pj>CKw}0yj?+&vn4Z8ulYCXNSnM;wmUvn`OU>%Vk{XPe;1-Rk
zq|F6re`WyF>`!R!{{eS&|MQ;MTUJU>H`XwD12up(w4Gpcn@zf6?y#Z7w`&&JI2E(R
z#wATGKG8BO3TAuQ*KD#Bv%)4@F<WeM;>L-&+oQkXo}EhVw`}qibB|1H1D{jWDi=Mk
zm^C&pDCRFV1&Y~V^P*yYX7iF_9<teGm=(;82O5)!7Akc{qD6`^5-nDYk!Xoxj6`=U
z#t3weVvMj#<0c+fjQ3%r<yMM~w8|7C)7rpt#Ta4jRg4i<g<_1b=y+{^86&KHag!;}
zm629eT&>}L;c-9gI6y}i!D5=hI;^L=Cl9j~Oiytr1<g+|lTI}K#WM~soS@c31sU#N
zA;pOe_uT8)w1F+6v&<7SV=Hx;(1VBQ=G}#Me1!%dW_B^VnLW(cm|o`V%oEIh=1Jxt
z)5r8PhnNB82y>K4tHfxr|6`dm$};2p`vmhH<`i?97(;xQAI>o^FyCXwn3tJXnIAB(
nF+XO`F>f+IW&Yb@iM5pZoAAFca0>-}D)|r1=lBKQf!x0Vy?x|Z

diff --git a/src/domain/Box.java b/src/domain/Box.java
index 5bde51c..77b5ccc 100644
--- a/src/domain/Box.java
+++ b/src/domain/Box.java
@@ -355,15 +355,15 @@ public class Box {
 
         if(savedGamemode.equals("Special8")){
 
-            if(setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour 
-            + setCategoryFive + setCategorySix + setCategorySeven + setCategoryEight >= 108){
+            if(nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour)
+            + nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) + nullCheckInt(setCategorySeven) + nullCheckInt(setCategoryEight) >= 108){
                 this.bonus = 35;
             }
 
         } else
             
-            if(setCategoryOne + setCategoryTwo + setCategoryThree + setCategoryFour 
-            + setCategoryFive + setCategorySix >= 63){
+            if(nullCheckInt(setCategoryOne) + nullCheckInt(setCategoryTwo) + nullCheckInt(setCategoryThree) + nullCheckInt(setCategoryFour)
+            + nullCheckInt(setCategoryFive) + nullCheckInt(setCategorySix) >= 63){
                 this.bonus = 35;
         }
 
@@ -440,4 +440,12 @@ public class Box {
         else
             return "" + i;
     }
+
+    public int nullCheckInt(Integer i) {
+
+        if(i == null)
+            return 0;
+        else
+            return i;
+    }
 }