From 90e3afd5c6943f21fe68174f10ccb2d54d875dde Mon Sep 17 00:00:00 2001
From: SowinskiBraeden <braeden@sowinski.dev>
Date: Fri, 28 Mar 2025 19:03:19 -0700
Subject: [PATCH] fix lab 10

---
 src/ca/bcit/comp1510/lab10/Collisions.java | 20 ++++++++++++++------
 src/ca/bcit/comp1510/lab10/Name.java       |  8 +++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/ca/bcit/comp1510/lab10/Collisions.java b/src/ca/bcit/comp1510/lab10/Collisions.java
index 20bb4db..3420322 100644
--- a/src/ca/bcit/comp1510/lab10/Collisions.java
+++ b/src/ca/bcit/comp1510/lab10/Collisions.java
@@ -37,15 +37,23 @@ public class Collisions {
         boolean collided = false;
         int stepsTaken = 0;
         
-        for (int i = 0; i < steps && !collided; i++) {
+        for (int i = 0; i < steps; i++) {
             w1.takeStep();
             w2.takeStep();
-            collided = samePosition(w1, w2);
+
+            if (samePosition(w1, w2)) {                
+                collided = true;
+                System.out.println("Collision at (" 
+                        + w1.getX() + ", "
+                        + w1.getY() + ") after " 
+                        + stepsTaken + " steps");
+            }
+            
             stepsTaken++;
         }
-        
-        String message = collided ? "Collision!" : "No Collision.";
-        System.out.println(message);
-        System.out.println("After " + stepsTaken + " steps");
+
+        if (!collided) {
+            System.out.println("No collisions.");
+        }
     }
 }
diff --git a/src/ca/bcit/comp1510/lab10/Name.java b/src/ca/bcit/comp1510/lab10/Name.java
index dac28a3..87a767c 100644
--- a/src/ca/bcit/comp1510/lab10/Name.java
+++ b/src/ca/bcit/comp1510/lab10/Name.java
@@ -101,12 +101,10 @@ public class Name implements Comparable<Name> {
     public int compareTo(Name n) {
         if (!this.last.equals(n.last)) {
             return this.last.compareTo(n.last);
+        } else if (!this.first.equals(n.first)) {
+            return this.first.compareTo(n.first);
         } else {
-            if (!this.first.equals(n.first)) {
-                return this.first.compareTo(n.first);
-            } else {
-                return this.middle.compareTo(n.middle);
-            }
+            return this.middle.compareTo(n.middle);
         }
     }