Merge origin/master

This commit is contained in:
LevelX2 2015-05-25 00:58:06 +02:00
commit 6480fb321e
7 changed files with 553 additions and 2 deletions

View file

@ -31,11 +31,11 @@ package mage.abilities.effects.common;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.constants.Outcome;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.filter.common.FilterControlledPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -110,7 +110,7 @@ public class SacrificeAllEffect extends OneShotEffect {
private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Each players sacrifices ");
sb.append("Each player sacrifices ");
if (amount.toString().equals("X")) {
sb.append(amount.toString());
} else {