From 43fed81ff4c651e7e4b5de02b28e58e19da4480b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 26 Jan 2014 11:26:45 +0100 Subject: [PATCH] Sort user list case insensitive. --- .../src/main/resources/avatars/special/20.gif | Bin 0 -> 2937 bytes .../src/main/java/mage/server/Session.java | 2 ++ .../java/mage/server/game/GamesRoomImpl.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Mage.Client/src/main/resources/avatars/special/20.gif diff --git a/Mage.Client/src/main/resources/avatars/special/20.gif b/Mage.Client/src/main/resources/avatars/special/20.gif new file mode 100644 index 0000000000000000000000000000000000000000..b0cdac2962089025b7759a3a8eecf176065dbd14 GIT binary patch literal 2937 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 Rfu`Ix`jWbl0R{u?{sY^OOeO#T literal 0 HcmV?d00001 diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index 7831dc9154c..232d82c9565 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -151,6 +151,8 @@ public class Session { userData.setAvatarId(1016); } else if (userName.equals("Ayrat")) { userData.setAvatarId(1018); + } else if (userName.equals("Bandit")) { + userData.setAvatarId(1020); } } diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java index 95e1d2ec2f4..45e1264a350 100644 --- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java +++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java @@ -206,6 +206,6 @@ class TimestampSorter implements Comparator { class UserNameSorter implements Comparator { @Override public int compare(UsersView one, UsersView two) { - return one.getUserName().compareTo(two.getUserName()); + return one.getUserName().compareToIgnoreCase(two.getUserName()); } } \ No newline at end of file