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

Cleanup, improvements etc.

Browse source
This commit is contained in:
Zzooouhh 2017-12-30 02:26:14 +01:00 • committed by GitHub
parent 818a005b59
commit c675f3b4d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2319,24 +2319,21 @@ public abstract class PlayerImpl implements Player, Serializable {
if (count < target.getNumberOfTargets()) {
newTarget.setMinNumberOfTargets(count);
}
boolean finishedSearch = false;
while (true) {
do {
if (newTarget.choose(Outcome.Neutral, playerId, targetPlayerId, game)) {
finishedSearch = true;
}
if (!targetPlayerId.equals(playerId) || handleLibraryCastableCards(library, game, targetPlayerId)) { // for handling Panglacial Wurm
if (finishedSearch) {
if (!targetPlayerId.equals(playerId) || !handleLibraryCastableCreatures(library, game, targetPlayerId)) { // for handling Panglacial Wurm
target.getTargets().clear();
for (UUID targetId : newTarget.getTargets()) {
target.add(targetId, game);
}
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.LIBRARY_SEARCHED, targetPlayerId, playerId));
}
break;
} else if (targetPlayerId.equals(playerId) && handleLibraryCastableCreatures(library, game, targetPlayerId)) {
newTarget.clearChosen();
continue;
}
newTarget.clearChosen();
finishedSearch = false;
}
break;
} while (true);
return true;
}
return false;
@ -2382,11 +2379,11 @@ public abstract class PlayerImpl implements Player, Serializable {
}
break;
}
return false;
return true;
}
}
}
return true;
return false;
}
@Override