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

Fixes #512

Browse source
This commit is contained in:
magenoxx 2014-08-15 00:12:29 +04:00
parent 7ddd36af0f
commit 5ede7221c8
199 changed files with 637 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/common/DamageControllerEffect.java
View file

@ -64,7 +64,7 @@ public class DamageControllerEffect extends OneShotEffect {
public int getAmount() {
if (amount instanceof StaticValue) {
return amount.calculate(null, null);
return amount.calculate(null, null, this);
} else {
return 0;
}
@ -85,7 +85,7 @@ public class DamageControllerEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
player.damage(amount.calculate(game, source), source.getSourceId(), game, false, preventable);
player.damage(amount.calculate(game, source, this), source.getSourceId(), game, false, preventable);
return true;
}
return false;