github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-14 01:01:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

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
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human
HumanPlayer.java
Mage.Sets/src/mage/cards/d
DrafnasRestoration.java
Mage/src/main/java/mage/target/common
TargetCardInHand.javaTargetCardInOpponentsGraveyard.javaTargetCardInYourGraveyard.java

2
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -535,7 +535,7 @@ public class HumanPlayer extends PlayerImpl {
updateGameStatePriority("choose(5)", game); updateGameStatePriority("choose(5)", game);
prepareForResponse(game); prepareForResponse(game);
if (!isExecutingMacro()) { if (!isExecutingMacro()) {
game.fireSelectTargetEvent(getId(), new MessageToClient(target.getMessage(), getRelatedObjectName(source.getSourceId(), game)), targetIds, required, getOptions(target, options)); game.fireSelectTargetEvent(getId(), new MessageToClient(target.getMessage(), getRelatedObjectName(source, game)), targetIds, required, getOptions(target, options));
} }
waitForResponse(game); waitForResponse(game);

2
Mage.Sets/src/mage/cards/d/DrafnasRestoration.java
View file

@ -67,7 +67,7 @@ class DrafnasRestorationTarget extends TargetCardInGraveyard {
Player targetPlayer = game.getPlayer(((StackObject) object).getStackAbility().getFirstTarget()); Player targetPlayer = game.getPlayer(((StackObject) object).getStackAbility().getFirstTarget());
if (targetPlayer != null) { if (targetPlayer != null) {
for (Card card : targetPlayer.getGraveyard().getCards(filter, sourceControllerId, source, game)) { for (Card card : targetPlayer.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()); possibleTargets.add(card.getId());
} }
} }

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); Player player = game.getPlayer(sourceControllerId);
if (player != null) { if (player != null) {
for (Card card : player.getHand().getCards(filter, sourceControllerId, source, game)) { 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()); possibleTargets.add(card.getId());
} }
} }
@ -75,7 +75,7 @@ public class TargetCardInHand extends TargetCard {
Player player = game.getPlayer(sourceControllerId); Player player = game.getPlayer(sourceControllerId);
if (player != null) { if (player != null) {
for (Card card : player.getHand().getCards(filter, sourceControllerId, source, game)) { 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++; possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) { if (possibleTargets >= this.minNumberOfTargets) {
return true; 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); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) { 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++; possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) { if (possibleTargets >= this.minNumberOfTargets) {
return true; return true;
@ -125,7 +125,7 @@ public class TargetCardInOpponentsGraveyard extends TargetCard {
if (player != null) { if (player != null) {
Set<UUID> targetsInThisGraveyeard = new HashSet<>(); Set<UUID> targetsInThisGraveyeard = new HashSet<>();
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) { 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()); 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<>(); Set<UUID> possibleTargets = new HashSet<>();
Player player = game.getPlayer(sourceControllerId); Player player = game.getPlayer(sourceControllerId);
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) { 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()); possibleTargets.add(card.getId());
} }
} }
@ -116,7 +116,7 @@ public class TargetCardInYourGraveyard extends TargetCard {
} }
int possibleTargets = 0; int possibleTargets = 0;
for (Card card : player.getGraveyard().getCards(filter, sourceControllerId, source, game)) { 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++; possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) { if (possibleTargets >= this.minNumberOfTargets) {
return true; return true;