From d707f16d0bcc43c0ddb077f97cbdae4c916265d9 Mon Sep 17 00:00:00 2001
From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com>
Date: Sun, 26 Apr 2026 16:24:55 +0200
Subject: [PATCH] Fix: Fixed "toString" Method Of Player.java.

---
 .../it/polimi/ingsw/gc14/Model/Player.java    | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java
index 8a79130..76db84c 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java
@@ -230,6 +230,8 @@ public class Player implements Serializable {
     // region Functions
     @Override
     public String toString() {
+        int Last = 5;
+
         var table = new AsciiTable(UNICODE, 1);
 
         table.addHeader(this.getUserName());
@@ -238,32 +240,64 @@ public class Player implements Serializable {
         table.addSeparator();
         table.addRow("Prestige: " + this.getPrestigeValue());
 
+        if(!this.hunters.isEmpty()){
+            Last = 5;
+        }
+        else if(!this.shamans.isEmpty()){
+            Last = 4;
+        }
+        else if(!this.gatherers.isEmpty()){
+            Last = 3;
+        }
+        else if(!this.builders.isEmpty()){
+            Last = 2;
+        }
+        else if(!this.inventors.isEmpty()){
+            Last = 1;
+        }
+        else{
+            Last = 0;
+        }
 
+        if(Last == 0){
+            table.addSeparator();
+        }
         table.addRow("CHARACTERS:");
         if(!this.artists.isEmpty()){
+            if(Last == 1){
+                table.addSeparator();
+            }
             table.addRow("Artists: " + this.artists.toString());
         }
 
         if(!this.builders.isEmpty()){
+            if(Last == 2){
+                table.addSeparator();
+            }
             table.addRow("Builders: " + this.builders.toString());
         }
 
         if(!this.gatherers.isEmpty()){
+            if(Last == 3){
+                table.addSeparator();
+            }
             table.addRow("Gatherers: " + this.gatherers.toString());
         }
 
         if(!this.shamans.isEmpty()){
+            if(Last == 4){
+                table.addSeparator();
+            }
             table.addRow("Shamans: " + this.shamans.toString());
         }
 
+
         if(!this.hunters.isEmpty()){
+            table.addSeparator();
             table.addRow("Hunters: " + this.hunters.toString());
         }
 
-        //TODO fix ?
-        table.addSeparator();
         table.addRow("BUILDING CARDS:");
-
         if(!this.buildingCards.isEmpty()){
             table.addRow("Buildings: " + this.buildingCards.toString());
         }