Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests 1 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

13
Mage.Common/src/main/java/mage/view/PlayerView.java
View file

@ -1,13 +1,5 @@
package mage.view;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.cards.Card;
import mage.counters.Counters;
import mage.designations.Designation;
@ -22,6 +14,9 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.players.net.UserData;
import java.io.Serializable;
import java.util.*;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -105,7 +100,7 @@ public class PlayerView implements Serializable {
}
Card cardOnTop = (player.isTopCardRevealed() && player.getLibrary().hasCards())
? player.getLibrary().getFromTop(game) : null;
this.topCard = cardOnTop != null ? new CardView(cardOnTop) : null;
this.topCard = cardOnTop != null ? new CardView(cardOnTop, game) : null;
if (player.getUserData() != null) {
this.userData = player.getUserData();
} else {