From 0193bf6e4da0b3c044a825e62bd84607b69682f0 Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 9 Apr 2014 01:27:46 +0000 Subject: [PATCH] Code cleanup --- .../src/main/java/forge/screens/match/CMatchUI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index ef128666aef..5b405162278 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -87,12 +87,12 @@ public enum CMatchUI implements ICDoc, IMenuProvider { private SkinImage getPlayerAvatar(final Player p, final int defaultIndex) { LobbyPlayer lp = p.getLobbyPlayer(); - if (null != lp.getIconImageKey()) { + if (lp.getIconImageKey() != null) { return ImageCache.getIcon(lp); } int avatarIdx = lp.getAvatarIndex(); - return FSkin.getAvatars().get(0 <= avatarIdx ? avatarIdx : defaultIndex); + return FSkin.getAvatars().get(avatarIdx >= 0 ? avatarIdx : defaultIndex); } private void setAvatar(VField view, SkinImage img) {