From 23cd772fea79957a246da1c933fe7cd856ba4f48 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 27 Sep 2015 14:11:56 +0200
Subject: [PATCH] * Fixed that using a previous internal avatar ID did create
 an exception while playing/watching a game.

---
 .../src/main/java/mage/client/game/PlayerPanelExt.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
index 31416d85e6e..1fd4c05df91 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
@@ -64,6 +64,8 @@ import mage.client.components.MageRoundPane;
 import mage.client.components.ext.dlg.DialogManager;
 import mage.client.dialog.PreferencesDialog;
 import static mage.client.dialog.PreferencesDialog.DEFAULT_AVATAR_ID;
+import static mage.client.dialog.PreferencesDialog.MAX_AVATAR_ID;
+import static mage.client.dialog.PreferencesDialog.MIN_AVATAR_ID;
 import mage.client.util.CardsViewUtil;
 import mage.client.util.Command;
 import mage.client.util.ImageHelper;
@@ -239,7 +241,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
 
         if (!MageFrame.isLite()) {
             int id = player.getUserData().getAvatarId();
-            if (id <= 0) {
+            if (id <= 0 || !(id >= 1000) || (id <= MIN_AVATAR_ID && id > MAX_AVATAR_ID)) {
                 id = PreferencesDialog.DEFAULT_AVATAR_ID;
             }
             if (id != avatarId) {