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

* AI: fixed rollback errors on play cards with target stack (Diplomatic Escort, Not of This World, etc);

Browse source
This commit is contained in:
Oleg Agafonov 2020-03-09 13:49:07 +04:00
parent 009e55c4f0
commit 86f6d39f5a
5 changed files with 126 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/filter/predicate/other/TargetsPermanentPredicate.java
View file

@ -1,7 +1,5 @@
package mage.filter.predicate.other;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Mode;
import mage.filter.FilterPermanent;
@ -12,8 +10,9 @@ import mage.game.permanent.Permanent;
import mage.game.stack.StackObject;
import mage.target.Target;
import java.util.UUID;
/**
*
* @author LoneFox
*/
public class TargetsPermanentPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<MageObject>> {
@ -31,6 +30,9 @@ public class TargetsPermanentPredicate implements ObjectSourcePlayerPredicate<Ob
for (UUID modeId : object.getStackAbility().getModes().getSelectedModes()) {
Mode mode = object.getStackAbility().getModes().get(modeId);
for (Target target : mode.getTargets()) {
if (target.isNotTarget()) {
continue;
}
for (UUID targetId : target.getTargets()) {
Permanent permanent = game.getPermanentOrLKIBattlefield(targetId);
if (permanent != null && targetFilter.match(permanent, input.getSourceId(), input.getPlayerId(), game)) {

6
Mage/src/main/java/mage/target/TargetStackObject.java
View file

@ -58,7 +58,8 @@ public class TargetStackObject extends TargetObject {
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
int count = 0;
for (StackObject stackObject : game.getStack()) {
if (game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId()) && filter.match(stackObject, sourceId, sourceControllerId, game)) {
if (game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId())
&& filter.match(stackObject, sourceId, sourceControllerId, game)) {
count++;
if (count >= this.minNumberOfTargets) {
return true;
@ -77,7 +78,8 @@ public class TargetStackObject extends TargetObject {
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
Set<UUID> possibleTargets = new HashSet<>();
for (StackObject stackObject : game.getStack()) {
if (game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId()) && filter.match(stackObject, sourceId, sourceControllerId, game)) {
if (game.getState().getPlayersInRange(sourceControllerId, game).contains(stackObject.getControllerId())
&& filter.match(stackObject, sourceId, sourceControllerId, game)) {
possibleTargets.add(stackObject.getId());
}
}