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

Refactored restore state code, added additional error check for mana undo param;

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-06 22:17:37 +04:00
parent 2eeefd91ef
commit 83f7ae377a
12 changed files with 64 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -699,6 +699,12 @@ public abstract class GameImpl implements Game, Serializable {
return savedStates.size();
}
/**
* Warning, for inner usage only, use player.restoreState as much as possible instead
*
* @param bookmark
* @param context additional information for error message
*/
@Override
public void restoreState(int bookmark, String context) {
if (!simulation && !this.hasEnded()) { // if player left or game is over no undo is possible - this could lead to wrong winner
@ -1247,7 +1253,7 @@ public abstract class GameImpl implements Game, Serializable {
if (player != null) {
int bookmark = player.getStoredBookmark();
if (bookmark != -1) {
restoreState(bookmark, "undo");
player.restoreState(bookmark, "undo", this);
player.setStoredBookmark(-1);
fireUpdatePlayersEvent();
}