Merge branch 'main' of github.com:Chief-Noob/Minecraft-Plugin

* 'main' of github.com:Chief-Noob/Minecraft-Plugin: 🐛 [team] trying to fix team
Chief-Noob · Aug 8, 2021 · 23909a8 · 23909a8
2 parents f781310 + 5efc840
commit 23909a8
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/main/java/com/linyuanlin/minecraft/App.java b/src/main/java/com/linyuanlin/minecraft/App.java
@@ -170,18 +170,21 @@ public boolean onCommand(CommandSender sender, Command cmd, String cmdlable, Str
                 }
                 case "list": {
                     StringBuilder teamMemberNameString = new StringBuilder();
-                    for (int i = 0; i < allPlayers.get(p1.getUniqueId()).team.get().size(); i++) {
-                        teamMemberNameString
-                                .append(allPlayers.get(p1.getUniqueId()).team.get().playerList.get(i).player.getName())
-                                .append(" ");
+                    Optional<Team> team = allPlayers.get(p1.getUniqueId()).team;
+
+                    if (!team.isPresent()) {
+                        p1.sendMessage("你沒隊伍拉");
+                        return false;
                     }
-                    TextComponent msg = new TextComponent("隊伍成員：" + teamMemberNameString);
-                    for (int i = 0; i < allPlayers.get(p1.getUniqueId()).team.get().size(); i++) {
-                        allPlayers.get(p1.getUniqueId()).team.get().playerList.get(i).player.spigot().sendMessage(msg);
+
+                    for (PlayerData pd : team.get().playerList) {
+                        teamMemberNameString.append(pd.player.getName()).append(" ");
                     }
 
+                    TextComponent msg = new TextComponent("隊伍成員：" + teamMemberNameString);
+                    p1.spigot().sendMessage(msg);
                 }
-                    break;
+                break;
                 default:
                     break;
             }