mirror of
https://github.com/correl/mage.git
synced 2024-12-26 19:16:54 +00:00
Merge pull request #4886 from GitHubMage/master
"Fixing" previous AliFromCairo fix
This commit is contained in:
commit
f3890daaab
1 changed files with 6 additions and 11 deletions
|
@ -97,7 +97,7 @@ class AliFromCairoReplacementEffect extends ReplacementEffectImpl {
|
||||||
&& (controller.getLife() > 0) &&(controller.getLife() - event.getAmount()) < 1
|
&& (controller.getLife() > 0) &&(controller.getLife() - event.getAmount()) < 1
|
||||||
&& event.getPlayerId().equals(controller.getId())
|
&& event.getPlayerId().equals(controller.getId())
|
||||||
) {
|
) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -106,17 +106,12 @@ class AliFromCairoReplacementEffect extends ReplacementEffectImpl {
|
||||||
@Override
|
@Override
|
||||||
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
|
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
|
||||||
Player controller = game.getPlayer(source.getControllerId());
|
Player controller = game.getPlayer(source.getControllerId());
|
||||||
|
|
||||||
// 10/1/2008: The ability doesn't change how much damage is dealt;
|
|
||||||
// it just changes how much life that damage makes you lose.
|
|
||||||
// An effect such as Spirit Link will see the full amount of damage being dealt.
|
|
||||||
game.fireEvent(event);
|
|
||||||
|
|
||||||
if (controller != null) {
|
if (controller != null) {
|
||||||
controller.setLife(1, game, source);
|
// 10/1/2008: The ability doesn't change how much damage is dealt;
|
||||||
|
// it just changes how much life that damage makes you lose.
|
||||||
|
// An effect such as Spirit Link will see the full amount of damage being dealt.
|
||||||
|
event.setAmount(controller.getLife() - 1);
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue