Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed potentially rollback errors with missing game data (#7273);

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-24 23:43:53 +04:00
parent 7065d3c512
commit a87c0b1ff6
6 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage.Common/src/main/java/mage/view/CardsView.java
View file

@ -6,7 +6,6 @@ import mage.abilities.effects.Effect;
import mage.cards.Card;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.GameState;
import mage.game.command.Emblem;
import mage.game.command.Plane;
import mage.game.permanent.Permanent;
@ -29,7 +28,7 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
}
/**
* Uses for card render tests
* Non game usage like card render tests
*
* @param cardViews
*/
@ -39,6 +38,11 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
}
}
/**
* Non game usage like deck editor
*
* @param cards
*/
public CardsView(Collection<? extends Card> cards) {
for (Card card : cards) {
this.put(card.getId(), new CardView(card));
@ -116,9 +120,9 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
if (abilityView == null) {
CardView sourceCardView;
if (isPermanent) {
sourceCardView = new CardView((Permanent) sourceObject);
sourceCardView = new CardView((Permanent) sourceObject, game);
} else if (isCard) {
sourceCardView = new CardView((Card) sourceObject);
sourceCardView = new CardView((Card) sourceObject, game);
} else {
sourceCardView = new CardView(sourceObject, game);
}
@ -164,14 +168,4 @@ public class CardsView extends LinkedHashMap<UUID, CardView> {
+ abilities.stream().map(a -> a.getClass().getSimpleName() + " - " + a.getRule()).collect(Collectors.joining("\n")));
}
}
public CardsView(Collection<? extends Ability> abilities, GameState state) {
for (Ability ability : abilities) {
Card sourceCard = state.getPermanent(ability.getSourceId());
if (sourceCard != null) {
this.put(ability.getId(), new AbilityView(ability, sourceCard.getName(), new CardView(sourceCard)));
}
}
}
}