github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

javadoc fixes

Browse source
This commit is contained in:
magenoxx 2014-07-17 15:16:46 +04:00
parent d0652eb990
commit 4b547e7a06
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/mage/game/stack/Spell.java
View file

@ -28,9 +28,6 @@
package mage.game.stack;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.Mana;
@ -50,11 +47,7 @@ import mage.abilities.keyword.BestowAbility;
import mage.abilities.keyword.MorphAbility;
import mage.cards.Card;
import mage.cards.SplitCard;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SpellAbilityType;
import mage.constants.Zone;
import mage.constants.*;
import mage.counters.Counter;
import mage.counters.Counters;
import mage.game.Game;
@ -66,6 +59,10 @@ import mage.target.Target;
import mage.target.TargetAmount;
import mage.watchers.Watcher;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
*
* @author BetaSteward_at_googlemail.com
@ -133,7 +130,7 @@ public class Spell implements StackObject, Card {
boolean ignoreAbility = true;
boolean payNoMana = noMana;
for (SpellAbility spellAbility: spellAbilities) {
// costs for spliced abilities were added to main spellAbility, so pay no man for spliced abilities
// costs for spliced abilities were added to main spellAbility, so pay no mana for spliced abilities
payNoMana |= spellAbility.getSpellAbilityType().equals(SpellAbilityType.SPLICE);
if (ignoreAbility) {
ignoreAbility = false;

2
Mage/src/mage/players/PlayerImpl.java
View file

@ -717,7 +717,7 @@ public abstract class PlayerImpl implements Player, Serializable {
//20091005 - 601.2a
Card card = game.getCard(ability.getSourceId());
if (card != null) {
if (card.isMorphCard()) {
if (card.isMorphCard()) { //TODO: move to other place
card.setFaceDown(true);
}
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.CAST_SPELL, ability.getId(), ability.getSourceId(), playerId))) {