Merge origin/master

This commit is contained in:
LevelX2 2014-11-27 15:22:24 +01:00
commit 61edeb4809

View file

@ -88,6 +88,7 @@ public class PermanentCard extends PermanentImpl {
this.abilities.clear(); this.abilities.clear();
this.abilities.addAll(card.getAbilities().copy()); this.abilities.addAll(card.getAbilities().copy());
this.abilities.setControllerId(this.controllerId); this.abilities.setControllerId(this.controllerId);
this.watchers.clear();
this.watchers.addAll(card.getWatchers()); this.watchers.addAll(card.getWatchers());
this.cardType.clear(); this.cardType.clear();
this.cardType.addAll(card.getCardType()); this.cardType.addAll(card.getCardType());