diff --git a/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java index f8061d603e..c507de4a48 100644 --- a/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java +++ b/Mage.Sets/src/mage/sets/eighthedition/VolcanicHammer.java @@ -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 { diff --git a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java index d32bd94922..fcd2ff3312 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java +++ b/Mage.Sets/src/mage/sets/ninthedition/VolcanicHammer.java @@ -36,9 +36,7 @@ import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; /** - * * @author magenoxx_at_gmail.com - */ public class VolcanicHammer extends CardImpl<VolcanicHammer> { diff --git a/Mage.Sets/src/mage/sets/urzassaga/Worship.java b/Mage.Sets/src/mage/sets/urzassaga/Worship.java index 614f15d2de..70c0bb0c63 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Worship.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Worship.java @@ -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); } } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java index 234a98138d..e96ef23a05 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/lifereduce/DamageSetToXLifeInsteadTest.java @@ -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 { diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 431094f3f6..8557d0a2b5 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -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