判断deckinfo不为null再执行

mobile/src/main/java/cn/garymb/ygomobile/loader/DeckLoader.java

@@ -133,6 +133,7 @@ public class DeckLoader {
         int code;
         isChanged = false;
         for (Integer id : deck.getMainlist()) {
+            if (tmp.get(id) != null) {
                 if (released_code_list.contains(tmp.get(id).getCode())) {//先查看id对应的卡片密码是否在正式数组中存在
                     code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));//替换成对应先行数组里的code
                     if (cardLoader.readAllCardCodes().get(code) != null) {//万一他还没下载扩展卡包就不执行否则会空指错误
@@ -145,9 +146,14 @@ public class DeckLoader {
                     isChanged = true;
                 }
                 deckInfo.addMainCards(id, tmp.get(id), type == DeckItemType.Pack);
+            } else {
+                Log.w("deckreader", "Card is unexpectedly null for id: " + id);
+            }
+
         }
         tmp = cardLoader.readCards(deck.getExtraList(), true);
         for (Integer id : deck.getExtraList()) {
+            if (tmp.get(id) != null) {
                 if (released_code_list.contains(tmp.get(id).getCode())) {
                     code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));
                     if (cardLoader.readAllCardCodes().get(code) != null) {
@@ -160,10 +166,14 @@ public class DeckLoader {
                     isChanged = true;
                 }
                 deckInfo.addExtraCards(tmp.get(id));
+            } else {
+                Log.w("deckreader", "Card is unexpectedly null for id: " + id);
+            }
         }
         tmp = cardLoader.readCards(deck.getSideList(), true);
 //        Log.i("kk", "desk:" + tmp.size()+"/"+side.size());
         for (Integer id : deck.getSideList()) {
+            if (tmp.get(id) != null) {
                 if (released_code_list.contains(tmp.get(id).getCode())) {
                     code = pre_code_list.get(released_code_list.indexOf(tmp.get(id).getCode()));
                     if (cardLoader.readAllCardCodes().get(code) != null) {
@@ -176,6 +186,10 @@ public class DeckLoader {
                     isChanged = true;
                 }
                 deckInfo.addSideCards(tmp.get(id));
+            } else {
+                Log.w("deckreader", "Card is unexpectedly null for id: " + id);
+            }
+
         }
         //Log.w("deck.source", deckInfo.toLongString());
         return deckInfo;