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

Merge branch 'master' into implement-zilortha

Browse source 
# Conflicts:
#	Mage/src/main/java/mage/game/GameImpl.java
This commit is contained in:
htrajan 2020-04-16 15:55:24 -07:00
commit a08bd34582
332 changed files with 1928 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/game/Game.java
View file

@ -411,7 +411,7 @@ public interface Game extends MageItem, Serializable {
boolean endTurn(Ability source);
int doAction(MageAction action);
int doAction(MageAction action, UUID sourceId);
//game transaction methods
void saveState(boolean bookmark);