Merge origin/master

This commit is contained in:
LevelX2 2015-11-26 00:48:51 +01:00
commit e6c0ee719e

View file

@ -154,14 +154,16 @@ class KondasBannerColorBoostEffect extends BoostAllEffect {
Permanent equipment = game.getPermanent(source.getSourceId());
if (equipment != null && equipment.getAttachedTo() != null) {
Permanent equipedCreature = game.getPermanent(equipment.getAttachedTo());
for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
if (equipedCreature.getColor(game).shares(perm.getColor(game))) {
perm.addPower(power.calculate(game, source, this));
perm.addToughness(toughness.calculate(game, source, this));
if (equipedCreature != null) {
for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
if (equipedCreature.getColor(game).shares(perm.getColor(game))) {
perm.addPower(power.calculate(game, source, this));
perm.addToughness(toughness.calculate(game, source, this));
}
}
return true;
}
return true;
}
return false;
}