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

Refactor: improved choose cards method to use source param (fixed NPE like #10233, #9974 and other bugs with choose cards)

Browse source
This commit is contained in:
Oleg Agafonov 2023-04-21 11:02:57 +04:00
parent 5474787641
commit 689b93d005
280 changed files with 341 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -937,7 +937,7 @@ public abstract class PlayerImpl implements Player, Serializable {
new FilterCard("card ORDER to put on the BOTTOM of your library (last one chosen will be bottommost)"));
target.setRequired(true);
while (cards.size() > 1 && this.canRespond()
&& this.choose(Outcome.Neutral, cards, target, game)) {
&& this.choose(Outcome.Neutral, cards, target, source, game)) {
UUID targetObjectId = target.getFirstTarget();
if (targetObjectId == null) {
break;
@ -1031,7 +1031,7 @@ public abstract class PlayerImpl implements Player, Serializable {
target.setRequired(true);
while (cards.size() > 1
&& this.canRespond()
&& this.choose(Outcome.Neutral, cards, target, game)) {
&& this.choose(Outcome.Neutral, cards, target, source, game)) {
UUID targetObjectId = target.getFirstTarget();
if (targetObjectId == null) {
break;
@ -2691,7 +2691,7 @@ public abstract class PlayerImpl implements Player, Serializable {
// handling Panglacial Wurm - cast cards while searching from own library
if (targetPlayer.getId().equals(searchingPlayer.getId())) {
if (handleCastableCardsWhileLibrarySearching(library, game, targetPlayer)) {
if (handleCastableCardsWhileLibrarySearching(library, targetPlayer, source, game)) {
// clear all choices to start from scratch (casted cards must be removed from library)
newTarget.clearChosen();
continue;
@ -2748,7 +2748,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
}
private boolean handleCastableCardsWhileLibrarySearching(Library library, Game game, Player targetPlayer) {
private boolean handleCastableCardsWhileLibrarySearching(Library library, Player targetPlayer, Ability source, Game game) {
// must return true after cast try (to restart searching process without casted cards)
// uses for handling Panglacial Wurm:
// * While you're searching your library, you may cast Panglacial Wurm from your library.
@ -2776,7 +2776,7 @@ public abstract class PlayerImpl implements Player, Serializable {
targetCard.setNotTarget(true);
while (castableCards.size() > 0) {
targetCard.clearChosen();
if (!targetPlayer.choose(Outcome.AIDontUseIt, new CardsImpl(castableCards), targetCard, game)) {
if (!targetPlayer.choose(Outcome.AIDontUseIt, new CardsImpl(castableCards), targetCard, source, game)) {
break;
}
@ -4539,7 +4539,7 @@ public abstract class PlayerImpl implements Player, Serializable {
byOwner ? card.getOwnerId() : getId(), fromZone, Zone.BATTLEFIELD, appliedEffects);
infoList.add(new ZoneChangeInfo.Battlefield(event, faceDown, tapped, source));
}
infoList = ZonesHandler.moveCards(infoList, game, source);
infoList = ZonesHandler.moveCards(infoList, source, game);
for (ZoneChangeInfo info : infoList) {
Permanent permanent = game.getPermanent(info.event.getTargetId());
if (permanent != null) {