github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-01 19:07:57 -09:00
Code Issues Projects Releases Packages Wiki Activity

minor

Browse source
This commit is contained in:
magenoxx 2012-07-23 01:29:29 +04:00
parent 9970f998ad
commit 6a70d1ee6d
5 changed files with 11 additions and 20 deletions
Mage.Sets/src/mage/sets
eighthedition
VolcanicHammer.java
ninthedition
VolcanicHammer.java
urzassaga
Worship.java
Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce
DamageSetToXLifeInsteadTest.java
Mage/src/mage/game
GameImpl.java

4
Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java
View file

@ -30,9 +30,7 @@ package mage.sets.eighthedition;
import java.util.UUID;
/**
*
* @author magenoxx_at_gmail.com
* @author magenoxx_at_gmail.com
*/
public class VolcanicHammer extends mage.sets.ninthedition.VolcanicHammer {

2
Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java
View file

@ -36,9 +36,7 @@ import mage.target.common.TargetCreatureOrPlayer;
import java.util.UUID;
/**
*
* @author magenoxx_at_gmail.com
*/
public class VolcanicHammer extends CardImpl<VolcanicHammer> {

4
Mage.Sets/src/mage/sets/urzassaga/Worship.java
View file

@ -43,9 +43,7 @@ import mage.players.Player;
import java.util.UUID;
/**
*
* @author magenoxx_at_gmail.com
*/
public class Worship extends CardImpl<Worship> {
@ -98,7 +96,7 @@ class WorshipReplacementEffect extends ReplacementEffectImpl<WorshipReplacementE
&& (controller.getLife() - event.getAmount()) < 1
&& event.getPlayerId().equals(controller.getId())
&& game.getBattlefield().count(new FilterControlledCreaturePermanent(), event.getPlayerId(), game) > 0
) {
) {
event.setAmount(controller.getLife() - 1);
}
}

2
Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java
View file

@ -8,7 +8,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
* Elderscale Wurm:
* As long as you have 7 or more life, damage that would reduce your life total to less than 7 reduces it to 7 instead..
*
* @author noxx
* @author magenoxx_at_gmail.com
*/
public class DamageSetToXLifeInsteadTest extends CardTestPlayerBase {

19
Mage/src/mage/game/GameImpl.java
View file

@ -28,15 +28,7 @@
package mage.game;
import java.io.IOException;
import java.io.Serializable;
import java.util.*;
import mage.Constants.CardType;
import mage.Constants.MultiplayerAttackOption;
import mage.Constants.Outcome;
import mage.Constants.PhaseStep;
import mage.Constants.RangeOfInfluence;
import mage.Constants.Zone;
import mage.Constants.*;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
@ -59,7 +51,7 @@ import mage.choices.Choice;
import mage.counters.CounterType;
import mage.filter.Filter;
import mage.filter.FilterPermanent;
import mage.filter.common.*;
import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.mageobject.SubtypePredicate;
@ -88,6 +80,10 @@ import mage.util.functions.ApplyToPermanent;
import mage.watchers.common.*;
import org.apache.log4j.Logger;
import java.io.IOException;
import java.io.Serializable;
import java.util.*;
public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializable {
private final static transient Logger logger = Logger.getLogger(GameImpl.class);
@ -1586,7 +1582,8 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
@Override
public void informPlayer(Player player, String message) {
//TODO: implement personal messages
if (simulation) return;
playerQueryEventSource.informPlayer(player.getId(), message);
}
@Override