github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed freeze and npe error while disconnects on choose target dialog;

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-10 15:53:53 +04:00
parent 188de12592
commit b432b4b431
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -269,14 +269,20 @@ public abstract class TargetImpl implements Target {
@Override @Override
public boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Game game) { public boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Game game) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
while (!isChosen() && !doneChosing()) { if (player != null) {
chosen = targets.size() >= getNumberOfTargets(); while (!isChosen() && !doneChosing()) {
if (!player.choose(outcome, this, sourceId, game)) { if (!player.canRespond()) {
return chosen; return chosen = targets.size() >= getNumberOfTargets();
}
chosen = targets.size() >= getNumberOfTargets();
if (!player.choose(outcome, this, sourceId, game)) {
return chosen;
}
chosen = targets.size() >= getNumberOfTargets();
} }
chosen = targets.size() >= getNumberOfTargets(); return chosen = true;
} }
return chosen = true; return false;
} }
@Override @Override