bug fix to Deathrattle summon minion effect when summoning more than …

…1 minions
oyachai · Dec 29, 2014 · 62a44be · 62a44be
1 parent 5b84749
commit 62a44be
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/com/hearthsim/event/deathrattle/DeathrattleSummonMinionAction.java b/src/main/java/com/hearthsim/event/deathrattle/DeathrattleSummonMinionAction.java
@@ -26,11 +26,16 @@ public HearthTreeNode performAction(
 		throws HSException
 	{
 		HearthTreeNode toRet = super.performAction(minion, playerSide, boardState, deckPlayer0, deckPlayer1);
-		for (int index = 0; index < numMinions_; ++index) {
+    	Minion placementTarget = toRet.data_.getCharacter(playerSide, toRet.data_.getMinions(playerSide).indexOf(minion));
+    	toRet.data_.removeMinion(minion);
+
+    	int numMinionsToActuallySummon = numMinions_;
+    	if (playerSide.getPlayer(toRet).getMinions().size() + numMinions_ > 7)
+
+    		numMinionsToActuallySummon = 7 - playerSide.getPlayer(toRet).getMinions().size();
+		for (int index = 0; index < numMinionsToActuallySummon; ++index) {
             try {
             	Minion newMinion = (Minion)minionClass_.newInstance();
-            	Minion placementTarget = toRet.data_.getCharacter(playerSide, toRet.data_.getMinions(playerSide).indexOf(minion)); //this minion can't be a hero
-            	toRet.data_.removeMinion(minion);
 				toRet = newMinion.summonMinion(playerSide, placementTarget, toRet, deckPlayer0, deckPlayer1, false, true);
 			} catch (InstantiationException | IllegalAccessException e) {
 				// TODO Auto-generated catch block