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

* Fixed a bug of exile target and search other zones function searching for wrong name (fixes ). Concerned Eradicate, Scour, Sowing Salt and Splinter.

Browse source
This commit is contained in:
LevelX2 2014-08-26 12:00:01 +02:00
parent 5d9a3a5867
commit a43182ef4a
2 changed files with 12 additions and 18 deletions

22
Mage/src/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java
View file

@ -58,38 +58,24 @@ public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTarget
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
boolean result = false; boolean result = false;
String cardName = "";
UUID targetPlayerId = null; UUID targetPlayerId = null;
// define cardName
if (source instanceof SpellAbility) {
Card sourceCard = game.getCard(source.getSourceId());
if (sourceCard != null) {
cardName = sourceCard.getName();
}
} else {
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent != null) {
cardName = sourcePermanent.getName();
}
}
// get Target to exile // get Target to exile
Target exileTarget = null; Target exileTarget = null;
for (Target target : source.getTargets()) { for (Target target : source.getTargets()) {
if (!(target instanceof TargetPlayer)) { if (target instanceof TargetPermanent) {
exileTarget = target; exileTarget = target;
break; break;
} }
} }
if (exileTarget != null) {
if (exileTarget != null && exileTarget instanceof TargetPermanent) {
Permanent permanentToExile = game.getPermanent(exileTarget.getFirstTarget()); Permanent permanentToExile = game.getPermanent(exileTarget.getFirstTarget());
if (permanentToExile != null) { if (permanentToExile != null) {
targetPlayerId = permanentToExile.getControllerId(); targetPlayerId = permanentToExile.getControllerId();
result = permanentToExile.moveToExile(null, "", source.getSourceId(), game); result = permanentToExile.moveToExile(null, "", source.getSourceId(), game);
this.applySearchAndExile(game, source, permanentToExile.getName(), targetPlayerId);
} }
} }
this.applySearchAndExile(game, source, cardName, targetPlayerId);
return result; return result;
} }

8
Mage/src/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
View file

@ -77,6 +77,14 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
this.graveyardExileOptional = effect.graveyardExileOptional; this.graveyardExileOptional = effect.graveyardExileOptional;
} }
/**
*
* @param game
* @param source
* @param cardName name of the card to exile
* @param targetPlayerId id of the target player to exile card name from his or her zones
* @return
*/
public boolean applySearchAndExile(Game game, Ability source, String cardName, UUID targetPlayerId) { public boolean applySearchAndExile(Game game, Ability source, String cardName, UUID targetPlayerId) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (cardName != null && controller != null) { if (cardName != null && controller != null) {