balancetop only braodcasts to the issuer now, fix messages, remove util sortingmethods

8 files changed, 24 insertions, 17 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 2427af9f5..c55623871 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -472,4 +472,14 @@ public class Util
         }));
         return keys;
     }
+	 
+ public static List<Object> getKeysFromValue(Map<?, ?> map, Object value){
+    List <Object>list = new ArrayList<Object>();
+    for(Object o:map.keySet()){
+        if(map.get(o).equals(value)) {
+            list.add(o);
+        }
+    }
+    return list;
+  }
 }
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
index f811f1d53..96c6505dd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
@@ -3,9 +3,12 @@ package com.earth2me.essentials.commands;
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -35,26 +38,20 @@ public class Commandbalancetop extends EssentialsCommand
 				//catch it because they tried to enter a string not number.
 			}
 		}
-		HashMap<User, Double> balances = new HashMap<User, Double>();
+		Map<Double, User> balances = new TreeMap<Double, User>(Collections.reverseOrder());
 		for (Map.Entry<String, User> u : ess.getAllUsers().entrySet())
 		{
-			balances.put(u.getValue(), u.getValue().getMoney());
+			balances.put(u.getValue().getMoney(), u.getValue());
 		}
 		int count = 0;
-		server.broadcastMessage(Util.format("balanceTop", max));
-		for (Iterator i = Util.sortMapByValueDesc(balances).iterator(); i.hasNext();)
+		sender.sendMessage(Util.format("balanceTop", max));
+		for (Map.Entry<Double, User> ba : balances.entrySet())
 		{
 			if (count == max)
 			{
 				break;
 			}
-			User key = (User)i.next();
-			
-			server.broadcastMessage(key.getDisplayName() + ", " + Util.formatCurrency(balances.get(key)));
-			if(!(sender instanceof Player))
-			{
-			sender.sendMessage(key.getDisplayName() + ", " + Util.formatCurrency(balances.get(key)));
-			}
+			sender.sendMessage(ba.getValue().getDisplayName() + ", " + Util.formatCurrency(ba.getKey()));
 			count++;
 		}
 	}
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 0ce89de6c..1a8a00b4c 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -12,7 +12,7 @@ backUsageMsg = \u00a77Returning to previous location.
 backupFinished = Backup finished
 backupStarted = Backup started
 balance = \u00a77Balance: {0}
-balanceTop = $7 Top {0} balances
+balanceTop = \u00a77 Top {0} balances
 banIpAddress = \u00a77Banned IP address
 bannedIpsFileError = Error reading banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt not found
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index c133eaac4..46f4f4179 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -14,7 +14,7 @@ backUsageMsg = \u00a77Returnere til tidligere placering.
 backupFinished = Backup sluttede
 backupStarted = Backup startede
 balance = \u00a77Balance: {0}
-balanceTop = $7 Top {0} saldi
+balanceTop = \u00a77 Top {0} saldi
 banIpAddress = \u00a77Bannede IP addresse
 bannedIpsFileError = Fejl i l\u00e6sning af banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt ikke fundet
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 3121f3b11..e265976d9 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -12,7 +12,7 @@ backUsageMsg = \u00a77Kehre zur letzten Position zur\u00fcck.
 backupFinished = Backup beendet
 backupStarted = Backup gestartet
 balance = \u00a77Geldb\u00f6rse: {0}
-balanceTop = $7 Top {0} Guthaben
+balanceTop = \u00a77 Top {0} Guthaben
 banIpAddress = \u00a77IP-Adresse gesperrt.
 bannedIpsFileError = Fehler beim Lesen von banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt nicht gefunden
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 0ce89de6c..1a8a00b4c 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -12,7 +12,7 @@ backUsageMsg = \u00a77Returning to previous location.
 backupFinished = Backup finished
 backupStarted = Backup started
 balance = \u00a77Balance: {0}
-balanceTop = $7 Top {0} balances
+balanceTop = \u00a77 Top {0} balances
 banIpAddress = \u00a77Banned IP address
 bannedIpsFileError = Error reading banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt not found
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 753324e55..eb7bac49e 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -12,7 +12,7 @@ backUsageMsg = \u00a77Retour a votre emplacement pr\u00e9c\u00e8dent.
 backupFinished = Backup termin\u00e9
 backupStarted = D\u00e9but du backup
 balance = \u00a77Solde: {0}
-balanceTop = $7 Top {0} soldes
+balanceTop = \u00a77 Top {0} soldes
 banIpAddress = \u00a77Adresse IP banni
 bannedIpsFileError = Erreur de lecture de banned-ips.txt
 bannedIpsFileNotFound = Fichier banned-ips.txt introuvable
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index de4c309de..f7655e472 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -13,7 +13,7 @@ backUsageMsg = \u00a77Bezig met terugkeren naar vorige locatie.
 backupFinished = Backup voltooid
 backupStarted = Backup wordt nu gemaakt
 balance = \u00a77Saldo: {0}
-balanceTop = $7 Top {0} saldi
+balanceTop = \u00a77 Top {0} saldi
 banIpAddress = \u00a77Verboden IP-adres
 bannedIpsFileError = Fout bij het lezen van banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt werd niet gevonden