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

Fix NPE in tryToAutoChoose when auto-choose is set to "Most"

Browse source
This commit is contained in:
Alex Vasile 2022-07-09 18:02:32 -04:00
parent a94c837ad0
commit 7ca7e10d80
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -612,6 +612,10 @@ public abstract class TargetImpl implements Target {
@Override @Override
public UUID tryToAutoChoose(UUID abilityControllerId, Ability source, Game game, Collection<UUID> possibleTargets) { public UUID tryToAutoChoose(UUID abilityControllerId, Ability source, Game game, Collection<UUID> possibleTargets) {
if (possibleTargets == null || game == null) {
return null;
}
Player player = game.getPlayer(abilityControllerId); Player player = game.getPlayer(abilityControllerId);
if (player == null) { if (player == null) {
return null; return null;
@ -626,7 +630,8 @@ public abstract class TargetImpl implements Target {
boolean canAutoChoose = this.getMinNumberOfTargets() == this.getMaxNumberOfTargets() && // Targets must be picked boolean canAutoChoose = this.getMinNumberOfTargets() == this.getMaxNumberOfTargets() && // Targets must be picked
possibleTargets.size() == this.getNumberOfTargets() - this.getSize() && // Available targets are equal to the number that must be picked possibleTargets.size() == this.getNumberOfTargets() - this.getSize() && // Available targets are equal to the number that must be picked
!strictModeEnabled && // Test AI is not set to strictChooseMode(true) !strictModeEnabled && // Test AI is not set to strictChooseMode(true)
playerAutoTargetLevel > 0; // Human player has enabled auto-choose in settings playerAutoTargetLevel > 0 && // Human player has enabled auto-choose in settings
!(playerAutoTargetLevel == 1 && source == null); // Is source is null, then the
if (canAutoChoose) { if (canAutoChoose) {
boolean autoTargetAll = playerAutoTargetLevel == 2; boolean autoTargetAll = playerAutoTargetLevel == 2;
@ -664,6 +669,7 @@ public abstract class TargetImpl implements Target {
if (targetingOwnThing) { if (targetingOwnThing) {
String abilityText = source.getRule(true).toLowerCase(); String abilityText = source.getRule(true).toLowerCase();
if (abilityText.contains("discard") if (abilityText.contains("discard")
|| abilityText.contains("sacrifice") || abilityText.contains("sacrifice")
|| abilityText.contains("destroy") || abilityText.contains("destroy")