From 5fe227b87420dcd195ecdfdd75d570f44fa96881 Mon Sep 17 00:00:00 2001
From: bm01 <baptiste.marie@orange.fr>
Date: Mon, 11 Jun 2012 08:20:39 +0200
Subject: [PATCH] Forgot to change getParties

---
 .../java/com/gmail/nossr50/api/PartyAPI.java  |  5 +--
 .../com/gmail/nossr50/party/PartyManager.java | 33 ++-----------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/api/PartyAPI.java b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
index 89ccaf7c8..d2d41988a 100644
--- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.Users;
 
@@ -49,13 +50,13 @@ public final class PartyAPI {
     }
 
     /**
-     * Get a list of all current party names.
+     * Get a list of all current parties.
      * </br>
      * This function is designed for API usage.
      *
      * @return the list of parties.
      */
-    public static List<String> getParties() {
+    public static List<Party> getParties() {
         return PartyManager.getInstance().getParties();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java
index 1793c708e..c92ba83b1 100644
--- a/src/main/java/com/gmail/nossr50/party/PartyManager.java
+++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -1,8 +1,6 @@
 package com.gmail.nossr50.party;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -156,38 +154,11 @@ public class PartyManager {
     }
 
     /**
-     * Get a list of all current party names.
+     * Get a list of all current parties.
      *
      * @return the list of parties.
      */
-    public List<String> getParties() {
-        String location = mcMMO.usersFile;
-        ArrayList<String> parties = new ArrayList<String>();
-
-        try {
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            String line = "";
-
-            while ((line = in.readLine()) != null) {
-                String[] character = line.split(":");
-                String theparty = null;
-
-                //Party
-                if (character.length > 3) {
-                    theparty = character[3];
-                }
-
-                if (!parties.contains(theparty)) {
-                    parties.add(theparty);
-                }
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            plugin.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-
+    public List<Party> getParties() {
         return parties;
     }