External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-04-04 15:33:01 +02:00
commit 269189f87e
9 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/game/events/GameEvent.java
View file

@ -166,7 +166,7 @@ public class GameEvent implements Serializable {
mana the mana added
*/
MANA_ADDED,
/* MANA_PAYED
/* MANA_PAID
targetId id if the ability the mana was paid for (not the sourceId)
sourceId sourceId of the mana source
playerId controller of the ability the mana was paid for
@ -174,7 +174,7 @@ public class GameEvent implements Serializable {
flag indicates a special condition
data originalId of the mana producing ability
*/
MANA_PAYED,
MANA_PAID,
LOSES, LOST, WINS,
TARGET, TARGETED,
/* TARGETS_VALID

5
Mage/src/main/java/mage/players/ManaPool.java
View file

@ -37,6 +37,7 @@ import java.util.UUID;
import mage.ConditionalMana;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
import mage.abilities.costs.Cost;
import mage.constants.Duration;
import mage.constants.ManaType;
@ -146,7 +147,7 @@ public class ManaPool implements Serializable {
continue;
}
if (mana.get(usableManaType) > 0) {
GameEvent event = new GameEvent(GameEvent.EventType.MANA_PAYED, ability.getId(), mana.getSourceId(), ability.getControllerId(), 0, mana.getFlag());
GameEvent event = new GameEvent(GameEvent.EventType.MANA_PAID, ability.getId(), mana.getSourceId(), ability.getControllerId(), 0, mana.getFlag());
event.setData(mana.getOriginalId().toString());
game.fireEvent(event);
mana.remove(usableManaType);
@ -424,7 +425,7 @@ public class ManaPool implements Serializable {
for (ConditionalMana mana : getConditionalMana()) {
if (mana.get(manaType) > 0 && mana.apply(ability, game, mana.getManaProducerId(), costToPay)) {
mana.set(manaType, mana.get(manaType) - 1);
GameEvent event = new GameEvent(GameEvent.EventType.MANA_PAYED, ability.getId(), mana.getManaProducerId(), ability.getControllerId(), 0, mana.getFlag());
GameEvent event = new GameEvent(GameEvent.EventType.MANA_PAID, ability.getId(), mana.getManaProducerId(), ability.getControllerId(), 0, mana.getFlag());
event.setData(mana.getManaProducerOriginalId().toString());
game.fireEvent(event);
break;