Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed check for creature.isTapped before calling MagicTapAction

master
melvin 2011-11-01 14:37:29 +08:00
parent 49213a7321
commit d94a66d871
9 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/card/Air_Servant.java
View File

@ -47,9 +47,7 @@ public class Air_Servant {
final Object[] choiceResults) { final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
}
} }
}); });
} }

2
src/magic/card/Avacynian_Priest.java
View File

@ -49,9 +49,7 @@ public class Avacynian_Priest {
final Object[] choiceResults) { final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
}
} }
}); });
} }

2
src/magic/card/Deathbringer_Liege.java
View File

@ -101,10 +101,8 @@ public class Deathbringer_Liege {
if (MagicMayChoice.isYesChoice(choiceResults[0])) { if (MagicMayChoice.isYesChoice(choiceResults[0])) {
event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
} }
}
}); });
} }
} }

2
src/magic/card/Gustcloak_Cavalier.java
View File

@ -43,10 +43,8 @@ public class Gustcloak_Cavalier {
if (MagicMayChoice.isYesChoice(choiceResults[0])) { if (MagicMayChoice.isYesChoice(choiceResults[0])) {
event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
} }
}
}); });
} }
} }

2
src/magic/card/Icy_Manipulator.java
View File

@ -49,9 +49,7 @@ public class Icy_Manipulator {
final Object[] choiceResults) { final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent permanent) { public void doAction(final MagicPermanent permanent) {
if (!permanent.isTapped()) {
game.doAction(new MagicTapAction(permanent,true)); game.doAction(new MagicTapAction(permanent,true));
}
} }
}); });
} }

2
src/magic/card/Kitsune_Dawnblade.java
View File

@ -41,10 +41,8 @@ public class Kitsune_Dawnblade {
if (MagicMayChoice.isYesChoice(choiceResults[0])) { if (MagicMayChoice.isYesChoice(choiceResults[0])) {
event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
} }
}
}); });
} }
} }

2
src/magic/card/Merfolk_Seastalkers.java
View File

@ -43,10 +43,8 @@ public class Merfolk_Seastalkers {
public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
} }
}
}); });
} }
}; };

2
src/magic/card/Sidar_Jabari.java
View File

@ -37,10 +37,8 @@ public class Sidar_Jabari {
final Object[] choiceResults) { final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() { event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
} }
}
}); });
} }
}; };

2
src/magic/card/Stun_Sniper.java
View File

@ -48,9 +48,7 @@ public class Stun_Sniper {
public void doAction(final MagicPermanent creature) { public void doAction(final MagicPermanent creature) {
final MagicDamage damage=new MagicDamage((MagicPermanent)data[0],creature,1,false); final MagicDamage damage=new MagicDamage((MagicPermanent)data[0],creature,1,false);
game.doAction(new MagicDealDamageAction(damage)); game.doAction(new MagicDealDamageAction(damage));
if (!creature.isTapped()) {
game.doAction(new MagicTapAction(creature,true)); game.doAction(new MagicTapAction(creature,true));
}
} }
}); });
} }