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

fixed some NPE issues with player target choosing

Browse source
This commit is contained in:
Evan Kranzler 2022-03-25 21:16:38 -04:00
parent a6c2daeb5e
commit 945b60c8d0
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/target/common/TargetCardInHand.java
View file

@ -61,7 +61,7 @@ public class TargetCardInHand extends TargetCard {
Player player = game.getPlayer(sourceControllerId);
if (player != null) {
for (Card card : player.getHand().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
possibleTargets.add(card.getId());
}
}
@ -75,7 +75,7 @@ public class TargetCardInHand extends TargetCard {
Player player = game.getPlayer(sourceControllerId);
if (player != null) {
for (Card card : player.getHand().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) {
return true;

4
Mage/src/main/java/mage/target/common/TargetCardInOpponentsGraveyard.java
View file

@ -100,7 +100,7 @@ public class TargetCardInOpponentsGraveyard extends TargetCard {
Player player = game.getPlayer(playerId);
if (player != null) {
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) {
return true;
@ -125,7 +125,7 @@ public class TargetCardInOpponentsGraveyard extends TargetCard {
if (player != null) {
Set<UUID> targetsInThisGraveyeard = new HashSet<>();
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
targetsInThisGraveyeard.add(card.getId());
}
}

4
Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java
View file

@ -76,7 +76,7 @@ public class TargetCardInYourGraveyard extends TargetCard {
Set<UUID> possibleTargets = new HashSet<>();
Player player = game.getPlayer(sourceControllerId);
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
possibleTargets.add(card.getId());
}
}
@ -116,7 +116,7 @@ public class TargetCardInYourGraveyard extends TargetCard {
}
int possibleTargets = 0;
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) {
if (source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
if (source == null || source.getSourceId() == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, source.getSourceId(), sourceControllerId))) {
possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) {
return true;