Merge origin/master

This commit is contained in:
LevelX2 2014-03-04 08:39:29 +01:00
commit 948449ee13

View file

@ -50,8 +50,8 @@ public class RedElementalBlast extends CardImpl<RedElementalBlast> {
private static final FilterPermanent filterPermanent = new FilterPermanent("blue permanent"); private static final FilterPermanent filterPermanent = new FilterPermanent("blue permanent");
private static final FilterSpell filterSpell = new FilterSpell("blue spell"); private static final FilterSpell filterSpell = new FilterSpell("blue spell");
static{ static{
filterPermanent.add(new ColorPredicate(ObjectColor.RED)); filterPermanent.add(new ColorPredicate(ObjectColor.BLUE));
filterSpell.add(new ColorPredicate(ObjectColor.RED)); filterSpell.add(new ColorPredicate(ObjectColor.BLUE));
} }
public RedElementalBlast(UUID ownerId) { public RedElementalBlast(UUID ownerId) {