Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Flashback - Fixed that exile effect was not removed after applied.

Browse source
This commit is contained in:
LevelX2 2016-03-10 00:09:50 +01:00
parent c2b68a9b6f
commit 3184252d54
4 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
@ -41,7 +40,6 @@ import mage.target.targetpointer.FixedTarget;
*
* @author Loki
*/
public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
private TargetController targetController;
@ -90,7 +88,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
case YOU:
boolean yours = event.getPlayerId().equals(this.controllerId);
if (yours && setTargetPointer) {
if (getTargets().size() == 0) {
if (getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
@ -99,7 +97,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
return yours;
case OPPONENT:
if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) {
if (setTargetPointer && getTargets().size() == 0) {
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
@ -108,7 +106,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
}
break;
case ANY:
if (setTargetPointer && getTargets().size() == 0) {
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
@ -119,7 +117,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
if (attachment != null && attachment.getAttachedTo() != null) {
Permanent attachedTo = game.getPermanent(attachment.getAttachedTo());
if (attachedTo != null && attachedTo.getControllerId().equals(event.getPlayerId())) {
if (setTargetPointer && getTargets().size() == 0) {
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
@ -143,9 +141,9 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
switch (targetController) {
case YOU:
if (this.optional) {
if (sb.substring(0, 6).toLowerCase().equals("target")){
if (sb.substring(0, 6).toLowerCase().equals("target")) {
sb.insert(0, "you may have ");
} else if (!sb.substring(0, 4).toLowerCase().equals("you ")){
} else if (!sb.substring(0, 4).toLowerCase().equals("you ")) {
sb.insert(0, "you may ");
}
}