rename data to upkeepPlayer

master
melvin 2012-10-07 17:14:09 +08:00
parent fa905bd707
commit 60ab53f087
1 changed files with 12 additions and 15 deletions

View File

@ -12,14 +12,14 @@ import magic.model.trigger.MagicAtUpkeepTrigger;
public class Mycoloth {
public static final Object T = new MagicAtUpkeepTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
final MagicPlayer player=permanent.getController();
return (player == data && permanent.getCounters(MagicCounterType.PlusOne) > 0) ?
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
return (permanent.isController(upkeepPlayer) &&
permanent.getCounters(MagicCounterType.PlusOne) > 0) ?
new MagicEvent(
permanent,
player,
this,
"Put a 1/1 green Saproling creature token onto the battlefield for each +1/+1 counter on SN."):
"Put a 1/1 green Saproling creature token onto the battlefield for each +1/+1 counter on SN."
):
MagicEvent.NONE;
}
@ -28,14 +28,11 @@ public class Mycoloth {
final MagicGame game,
final MagicEvent event,
final Object[] choiceResults) {
final MagicPermanent permanent=event.getPermanent();
final MagicPlayer player=event.getPlayer();
if (player.controlsPermanent(permanent)) {
final int tokens = permanent.getCounters(MagicCounterType.PlusOne);
for (int count=tokens;count>0;count--) {
game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.get("Saproling")));
}
}
final int amt = event.getPermanent().getCounters(MagicCounterType.PlusOne);
game.doAction(amt, new MagicPlayTokenAction(
event.getPlayer(),
TokenCardDefinitions.get("Saproling")
));
}
};
}