mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
consistency fix
This commit is contained in:
parent
a569a4cf0f
commit
74c69f5d4a
4 changed files with 4 additions and 4 deletions
|
@ -93,7 +93,7 @@ class RoaringPrimadoxEffect extends OneShotEffect<RoaringPrimadoxEffect> {
|
||||||
Player player = game.getPlayer(source.getControllerId());
|
Player player = game.getPlayer(source.getControllerId());
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent();
|
TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent();
|
||||||
if (player.choose(this.outcome, target, source.getId(), game)) {
|
if (player.choose(this.outcome, target, source.getSourceId(), game)) {
|
||||||
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
||||||
if (permanent != null) {
|
if (permanent != null) {
|
||||||
return permanent.moveToZone(Zone.HAND, source.getId(), game, false);
|
return permanent.moveToZone(Zone.HAND, source.getId(), game, false);
|
||||||
|
|
|
@ -99,7 +99,7 @@ class CruelUltimatumEffect extends OneShotEffect<CruelUltimatumEffect> {
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
Player player = game.getPlayer(source.getControllerId());
|
Player player = game.getPlayer(source.getControllerId());
|
||||||
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
|
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard("creature card from your graveyard"));
|
||||||
if (player != null && player.choose(Outcome.ReturnToHand, target, source.getId(), game)) {
|
if (player != null && player.choose(Outcome.ReturnToHand, target, source.getSourceId(), game)) {
|
||||||
Card card = game.getCard(target.getFirstTarget());
|
Card card = game.getCard(target.getFirstTarget());
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
return card.moveToZone(Zone.HAND, source.getId(), game, true);
|
return card.moveToZone(Zone.HAND, source.getId(), game, true);
|
||||||
|
|
|
@ -104,7 +104,7 @@ class StuffyDollChoosePlayerEffect extends OneShotEffect<StuffyDollChoosePlayerE
|
||||||
if (player != null && permanent != null) {
|
if (player != null && permanent != null) {
|
||||||
TargetPlayer target = new TargetPlayer();
|
TargetPlayer target = new TargetPlayer();
|
||||||
target.setRequired(true);
|
target.setRequired(true);
|
||||||
if (player.choose(this.outcome, target, source.getId(), game)) {
|
if (player.choose(this.outcome, target, source.getSourceId(), game)) {
|
||||||
Player chosenPlayer = game.getPlayer(target.getFirstTarget());
|
Player chosenPlayer = game.getPlayer(target.getFirstTarget());
|
||||||
if (chosenPlayer != null) {
|
if (chosenPlayer != null) {
|
||||||
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + chosenPlayer.getName());
|
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + chosenPlayer.getName());
|
||||||
|
|
|
@ -242,7 +242,7 @@ class ChandraAblazeEffect5 extends OneShotEffect<ChandraAblazeEffect5> {
|
||||||
TargetCardInGraveyard target = new TargetCardInGraveyard(filter);
|
TargetCardInGraveyard target = new TargetCardInGraveyard(filter);
|
||||||
while (!cards.isEmpty() && player.chooseUse(outcome, message, game)) {
|
while (!cards.isEmpty() && player.chooseUse(outcome, message, game)) {
|
||||||
target.clearChosen();
|
target.clearChosen();
|
||||||
if (player.choose(outcome, target, source.getId(), game)) {
|
if (player.choose(outcome, target, source.getSourceId(), game)) {
|
||||||
Card card = game.getCard(target.getFirstTarget());
|
Card card = game.getCard(target.getFirstTarget());
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
player.cast(card.getSpellAbility(), game, true);
|
player.cast(card.getSpellAbility(), game, true);
|
||||||
|
|
Loading…
Reference in a new issue