* Standard Bearer - fixed that it can broke spells on false Flagbearer checks (#5784);

This commit is contained in:
Oleg Agafonov 2019-05-06 01:41:28 +04:00
parent a8cee1abf7
commit 7089a09061

View file

@ -66,7 +66,7 @@ public class Targets extends ArrayList<Target> {
if (!canChoose(source.getSourceId(), playerId, game)) { if (!canChoose(source.getSourceId(), playerId, game)) {
return false; return false;
} }
int state = game.bookmarkState(); //int state = game.bookmarkState();
while (!isChosen()) { while (!isChosen()) {
Target target = this.getUnchosen().get(0); Target target = this.getUnchosen().get(0);
UUID targetController = playerId; UUID targetController = playerId;
@ -93,7 +93,7 @@ public class Targets extends ArrayList<Target> {
// Check if there are some rules for targets are violated, if so reset the targets and start again // Check if there are some rules for targets are violated, if so reset the targets and start again
if (this.getUnchosen().isEmpty() if (this.getUnchosen().isEmpty()
&& game.replaceEvent(new GameEvent(GameEvent.EventType.TARGETS_VALID, source.getSourceId(), source.getSourceId(), source.getControllerId()), source)) { && game.replaceEvent(new GameEvent(GameEvent.EventType.TARGETS_VALID, source.getSourceId(), source.getSourceId(), source.getControllerId()), source)) {
game.restoreState(state, "Targets"); //game.restoreState(state, "Targets");
clearChosen(); clearChosen();
} }
} }