From 01d80d8ad249a94eb48eae23dcebe170c0ad361c Mon Sep 17 00:00:00 2001
From: seahi <me@seahi.me>
Date: Thu, 5 Dec 2024 09:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=94=A8TreeSet=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chapter6/demo64/Game.java   |  7 +------
 src/chapter6/demo64/Player.java | 11 +++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/chapter6/demo64/Game.java b/src/chapter6/demo64/Game.java
index 095eb95..dafd4ca 100644
--- a/src/chapter6/demo64/Game.java
+++ b/src/chapter6/demo64/Game.java
@@ -49,12 +49,7 @@ public class Game {
             }
         }
 
-        // 3. 整理手牌
-        player1.sortHand();
-        player2.sortHand();
-        player3.sortHand();
-
-        // 4. 显示结果
+        // 3. 显示结果
         showResult();
     }
 
diff --git a/src/chapter6/demo64/Player.java b/src/chapter6/demo64/Player.java
index 595cdab..e97b512 100644
--- a/src/chapter6/demo64/Player.java
+++ b/src/chapter6/demo64/Player.java
@@ -3,11 +3,13 @@ package chapter6.demo64;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.TreeSet;
 
 // Player.java - 玩家类
 public class Player {
     private String name;
-    private ArrayList<Card> hand = new ArrayList<>();
+    // Card类已经实现Comparable接口，可以使用TreeSet自动排序
+    private TreeSet<Card> hand = new TreeSet<>();
 
     /**
      * 构造函数
@@ -25,13 +27,6 @@ public class Player {
         hand.add(card);
     }
 
-    /**
-     * 整理手牌
-     */
-    public void sortHand() {
-        Collections.sort(hand);
-    }
-
     /**
      * 显示手牌
      * @return 手牌的字符串表示