From 4504de8c489e2967b410d25391073c7383a31ae3 Mon Sep 17 00:00:00 2001
From: Mykola Fesenko <mykola.fesenko@schule.local>
Date: Mon, 6 Oct 2025 10:59:18 +0200
Subject: [PATCH] 06.10

---
 Game.class | Bin 5206 -> 5839 bytes
 Game.java  |  25 +++++++++++++++----------
 Game.~ava  |  24 +++++++++++++-----------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Game.class b/Game.class
index 943e1504f093d385e96144d7b640961c48d09cb4..0a88886884fd8cbc0285fc2cd1cf9d0f7be57764 100644
GIT binary patch
delta 2683
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

delta 1998
zcmcIlYi|@)7=C7FcDFk_+od#ZU1wVxbbDD+Q4y^*HqmMWRX0Rs8)&#hiUG6~MYJ}R
zjSWfFSYjO$3mCQ(XjQ8Ax@ai{?+Pm3sCUtC`o$lBN`20m>9p1O(PXpd%zJ;H_dVyF
zt(Yp)PhT9L1aLEc8Pd1<vLZNa;0XGxoBTz(4jnHUcp0x)2Yk`$0NOEN;8i3PcsDjb
z(EN~&2wpcZh#>{qjxDX56sTq8E3z;`i`wR$+ZuITjxhrn92*()ukl#BeEC*LFR^-q
zOJi>^uLo~J!6ID7fBSo!yDPDTIt9luVO<EuloM95u}Yb=9x)c1C#f;018&7Byd~}4
z#ygapuqKQ}v^sATED=`4Q2C$ZSc%=cj4M2I@E(>jw}SWaf%J@p2I)B!s<~Qt#-X7M
z1^5sXw5rDq&JIYs(bD(`r|Emfs>?Q6;eFYajF8SQs235I!_WUx*SZuRW1-Alich%n
zNbRS%P1ab7v)p;5jP%ks2l@Dn*|X@=i9NE$P`EfHdZkP6I%MMxh+O&dJM88P<8ypL
z4+UT1E8$6-8rq1Q!C`DzJc?&C=o;du2eSba47_qqz@Qs2C`%Cm{VDiFL~A6xf@uE=
zmzIbM?0!@_4reIwLd`7*(zKG~35U7`moA&lbuWQ!oRcfy<_h2(fr(t}uwHuZT~H)p
zi^RaDIbI>xE96$V4hMu6r>C6M`smRXH=`M(6ZTT2k%0;|gF~m#ZWAFD{Z-zGcN9lw
zRY&`9i7nDnGv<_ewE-!OXl@WnBaTd)Z>bKj08Nryf&llM+1o7$V=Jfge$H4EyS<IH
zZ$}FrL@Rbkc-3~{F1%EmJ3ejB`1r9CQ#>{*gEir6?!?I6gKs!AUVO_`Vk~T{ao1{`
zR-!#&crIe49})R$FDGRO(Mtz0E5Ff5<Jxc>k=4gwCd|}6L@VMNY3$FSqrM{Uo!R!|
zdQ<BWT6IP=PaB!1n2j*V_%<(bjveqQ2cm^@^cYWFD`IHl8GIbeu#1!X1X2lJJ*%->
zk|Pc$i*w0oaJgx4xXHrZ_)c;oco4&BO9T%By$<zH#0b4G&$)EIr_B%lO@P&utEU|3
zrq^MC(4#hVlaugoEuqg<a58M0e?sqIbx*R&rwILNLVt$PI|+Rcp?7gSo+I+-aWcii
z|1apg;q61idrp<~Ce`Y~_$Z1qcui~U#qwdKHWc#G5HhaL;W2wqK2Neg+Jgcfu!X}J
zY@VYT+^s78(?g2DuFB(3BrnKrPU2op>ONFqKW@Q`#M{j&PP?7<;4b{g3sbG4Ytn6c
z(rtRuX}V~vAsXvZ{=n@QcnB1%qKCMAuFbnq8MU_OMfu;ESCSf)<^0M5%O|zQ>O%7%
za>YmCHS8pn)BV%Gi|f%YwU)OrI2;BJv5>=j^NyedeYlG2b$lIb$lje?lY9u*Vu)vZ
z7!Px8#TYvH^mTE4fp6K&yI|JBv@xL?dCqRVD{FUUAQ$!%CwAwY2c#Q6@rLy9;c3ag
NBB0<ri}T>;zX8Nuos|Fp

diff --git a/Game.java b/Game.java
index 6c46613..38ee3cc 100644
--- a/Game.java
+++ b/Game.java
@@ -102,15 +102,19 @@ public class Game {
   }
   public boolean checkCombo(int relX, int relY) {
     ArrayList<Chip> hChips = getHorizontalCloseChips(relX,relY);
-    ArrayList<Chip> vChips = getHorizontalCloseChips(relX,relY);
-    System.out.println(hChips.get(0).relativeX);
-    Chip start_chip =     getChipByPos(relX,relY);
+    ArrayList<Chip> vChips = getVerticalCloseChips(relX,relY);
     
-    if (start_chip.color == hChips.get(0).color && start_chip.color == hChips.get(1).color)  {
-      return true;
+    Chip start_chip =     getChipByPos(relX,relY);
+    System.out.println("Size" + hChips.toString());
+    if (hChips.get(0) != null && hChips.get(1) != null ) {
+      if (start_chip.color == hChips.get(0).color && start_chip.color == hChips.get(1).color)  {
+        return true;
+      }
     }
-    if (start_chip.color == vChips.get(0).color && start_chip.color == vChips.get(1).color)  {
-      return true;
+    if(vChips.get(0) != null && vChips.get(1) != null) {
+      if (start_chip.color == vChips.get(0).color && start_chip.color == vChips.get(1).color)  {
+        return true;
+      }  
     }
     return false;
   } 
@@ -128,7 +132,8 @@ public class Game {
     else {
       result.add(getChipByPos(0,relY));
       result.add(getChipByPos(1,relY));
-    } // end of if-else 
+    } // end of if-else
+    System.out.println("Result: " + result.toString()); 
     return result;
   } 
   public ArrayList<Chip> getVerticalCloseChips(int relX, int relY) {
@@ -148,9 +153,9 @@ public class Game {
     return result;
   } 
   public Chip getChipByPos(int relX, int relY) {
-    
-    for (int i = 0; i < chips.size()-1; i++) {
+    for (int i = 0; i <= chips.size() - 1; i++) {
       if (chips.get(i).relativeX == relX && chips.get(i).relativeY == relY ) {
+         System.out.println("X" + chips.get(i).relativeX);
         return chips.get(i);
       } // end of if  
     } 
diff --git a/Game.~ava b/Game.~ava
index 318e4c2..989b478 100644
--- a/Game.~ava
+++ b/Game.~ava
@@ -102,15 +102,19 @@ public class Game {
   }
   public boolean checkCombo(int relX, int relY) {
     ArrayList<Chip> hChips = getHorizontalCloseChips(relX,relY);
-    ArrayList<Chip> vChips = getHorizontalCloseChips(relX,relY);
-    System.out.println(hChips.get(0).relativeX);
-    Chip start_chip =     getChipByPos(relX,relY);
+    ArrayList<Chip> vChips = getVerticalCloseChips(relX,relY);
     
-    if (start_chip.color == hChips.get(0).color && start_chip.color == hChips.get(1).color)  {
-      return true;
+    Chip start_chip =     getChipByPos(relX,relY);
+    System.out.println("Size" + hChips.toString());
+    if (hChips.get(0) != null && hChips.get(1) != null ) {
+      if (start_chip.color == hChips.get(0).color && start_chip.color == hChips.get(1).color)  {
+        return true;
+      }
     }
-    if (start_chip.color == vChips.get(0).color && start_chip.color == vChips.get(1).color)  {
-      return true;
+    if(vChips.get(0) != null && vChips.get(1) != null) {
+      if (start_chip.color == vChips.get(0).color && start_chip.color == vChips.get(1).color)  {
+        return true;
+      }  
     }
     return false;
   } 
@@ -148,11 +152,9 @@ public class Game {
     return result;
   } 
   public Chip getChipByPos(int relX, int relY) {
-    
-    for (int i = 0; i < chips.size()-1; i++) {
-    System.out.println(i);
+    for (int i = 0; i <= chips.size() - 1; i++) {
       if (chips.get(i).relativeX == relX && chips.get(i).relativeY == relY ) {
-        System.out.println("Found");
+         System.out.println("X" + chips.get(i).relativeX);
         return chips.get(i);
       } // end of if  
     }