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

Added MANA_PAYED event

Browse source
This commit is contained in:
magenoxx 2012-05-23 14:01:04 +04:00
parent 2f13b536b0
commit d94361cee7
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/mage/game/events/GameEvent.java
View file

@ -28,9 +28,10 @@
package mage.game.events;
import java.util.UUID;
import mage.Constants.Zone;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -87,7 +88,7 @@ public class GameEvent {
PLAY_LAND, LAND_PLAYED,
CAST_SPELL, SPELL_CAST,
ACTIVATE_ABILITY, ACTIVATED_ABILITY,
MANA_ADDED,
MANA_ADDED, MANA_PAYED,
LOSES, LOST, WINS,
TARGET, TARGETED,
COUNTER, COUNTERED,

4
Mage/src/mage/players/ManaPool.java
View file

@ -86,6 +86,7 @@ public class ManaPool implements Serializable {
for (ManaPoolItem mana : manaItems) {
if (filter == null || filter.match(game.getObject(mana.getSourceId()))) {
if (mana.get(manaType) > 0) {
game.fireEvent(new GameEvent(GameEvent.EventType.MANA_PAYED, ability.getId(), mana.getSourceId(), ability.getControllerId()));
mana.remove(manaType);
return true;
}
@ -279,7 +280,8 @@ public class ManaPool implements Serializable {
for (ConditionalMana mana : getConditionalMana()) {
if (mana.get(manaType) > 0 && mana.apply(ability, game, mana.getManaProducerId())) {
mana.set(manaType, mana.get(manaType) - 1);
break;
game.fireEvent(new GameEvent(GameEvent.EventType.MANA_PAYED, ability.getId(), mana.getManaProducerId(), ability.getControllerId()));
break;
}
}
}