Merge origin/master

This commit is contained in:
LevelX2 2015-01-25 23:15:12 +01:00
commit f241660c5c
4 changed files with 4 additions and 4 deletions

View file

@ -110,7 +110,7 @@ public class NecropolisFiend extends CardImpl {
ExileFromGraveCost exileCost = (ExileFromGraveCost) cost; ExileFromGraveCost exileCost = (ExileFromGraveCost) cost;
for(Target target: exileCost.getTargets()) { for(Target target: exileCost.getTargets()) {
if (target instanceof TargetCardInYourGraveyard) { if (target instanceof TargetCardInYourGraveyard) {
target.setMaxNumberOftargets(xValue); target.setMaxNumberOfTargets(xValue);
target.setMinNumberOfTargets(xValue); target.setMinNumberOfTargets(xValue);
} }
} }

View file

@ -455,7 +455,7 @@ public class Spell implements StackObject, Card {
((TargetAmount)tempTarget).setAmountDefinition(new StaticValue(target.getTargetAmount(targetId))); ((TargetAmount)tempTarget).setAmountDefinition(new StaticValue(target.getTargetAmount(targetId)));
} }
tempTarget.setMinNumberOfTargets(1); tempTarget.setMinNumberOfTargets(1);
tempTarget.setMaxNumberOftargets(1); tempTarget.setMaxNumberOfTargets(1);
boolean again; boolean again;
do { do {
again = false; again = false;

View file

@ -88,7 +88,7 @@ public interface Target extends Serializable {
int getNumberOfTargets(); int getNumberOfTargets();
int getMaxNumberOfTargets(); int getMaxNumberOfTargets();
void setMinNumberOfTargets(int minNumberofTargets); void setMinNumberOfTargets(int minNumberofTargets);
void setMaxNumberOftargets(int maxNumberofTargets); void setMaxNumberOfTargets(int maxNumberofTargets);
List<UUID> getTargets(); List<UUID> getTargets();
Filter getFilter(); Filter getFilter();

View file

@ -103,7 +103,7 @@ public abstract class TargetImpl implements Target {
} }
@Override @Override
public void setMaxNumberOftargets(int maxNumberOftargets) { public void setMaxNumberOfTargets(int maxNumberOftargets) {
this.maxNumberOfTargets = maxNumberOftargets; this.maxNumberOfTargets = maxNumberOftargets;
} }