External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed some problems for handling concede during game init.

Browse source
This commit is contained in:
LevelX2 2017-11-04 18:19:41 +01:00
parent 5a9671cbca
commit 0d46c68924
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -563,7 +563,12 @@ public abstract class GameImpl implements Game, Serializable {
// }
@Override
public void setConcedingPlayer(UUID playerId) {
Player player = getPlayer(state.getPriorityPlayerId());
Player player = null;
if (state.getChoosingPlayerId() != null) {
player = getPlayer(state.getChoosingPlayerId());
} else if (state.getPriorityPlayerId() != null) {
player = getPlayer(state.getPriorityPlayerId());
}
if (player != null) {
if (!player.hasLeft() && player.isHuman()) {
if (!concedingPlayers.contains(playerId)) {