From 16ff5b40361c992d258e3bacedeed20fc375ee93 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Mon, 22 May 2017 17:03:59 +0800
Subject: [PATCH] 10

---
 card/gwent.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/card/gwent.js b/card/gwent.js
index ff8b2fe8b..88629cb69 100644
--- a/card/gwent.js
+++ b/card/gwent.js
@@ -857,20 +857,26 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					list.push(get.cardPile('huogong','cardPile'));
 					list.push(get.cardPile('nanman','cardPile'));
 					list.push(get.cardPile('huoshaolianying','cardPile'));
-					list=[list.randomGet()];
-					if(list.length){
-						list.push(get.cardPile('sha','cardPile'));
+					for(var i=0;i<list.length;i++){
+						if(!list[i]) list.splice(i--,1);
 					}
-					else{
-						var sha=get.cardPile('sha','cardPile');
-						if(sha){
+					list=[list.randomGet()];
+					var sha=get.cardPile('sha','cardPile');
+					if(sha){
+						if(list.length){
+							list.push(sha);
+						}
+						else{
 							sha.remove();
 							list.push(sha);
-							list.push(get.cardPile('sha','cardPile'));
+							var sha2=get.cardPile('sha','cardPile');
+							if(sha2){
+								list.push(sha2);
+							}
 						}
 					}
 					if(list.length){
-						player.gain(list,'gain2','log');
+						target.gain(list,'gain2','log');
 					}
 				},
 				ai:{