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

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2017-09-13 17:05:37 +02:00
parent 55917ccc63
commit c70b548464
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/p/PlagueBelcher.java
View file

@ -32,6 +32,7 @@ import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.DiesCreatureTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.LoseLifeOpponentsEffect;
import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.abilities.keyword.MenaceAbility; import mage.abilities.keyword.MenaceAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -77,7 +78,7 @@ public class PlagueBelcher extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// Whenever another Zombie you control dies, each opponent loses 1 life. // Whenever another Zombie you control dies, each opponent loses 1 life.
this.addAbility(new DiesCreatureTriggeredAbility(new LoseLifeOpponentsEffect(), false, filter)); this.addAbility(new DiesCreatureTriggeredAbility(new LoseLifeOpponentsEffect(1), false, filter));
} }
public PlagueBelcher(final PlagueBelcher card) { public PlagueBelcher(final PlagueBelcher card) {

19
Mage/src/main/java/mage/abilities/condition/common/PermanentsOnTheBattlefieldCondition.java
View file

@ -28,8 +28,8 @@
package mage.abilities.condition.common; package mage.abilities.condition.common;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.constants.ComparisonType;
import mage.abilities.condition.Condition; import mage.abilities.condition.Condition;
import mage.constants.ComparisonType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game; import mage.game.Game;
@ -63,9 +63,10 @@ public class PermanentsOnTheBattlefieldCondition implements Condition {
} }
/** /**
* Applies a filter, a {@link ComparisonType}, and count to permanents on the * Applies a filter, a {@link ComparisonType}, and count to permanents on
* battlefield when checking the condition during the * the battlefield when checking the condition during the
* {@link #apply(mage.game.Game, mage.abilities.Ability) apply} method invocation. * {@link #apply(mage.game.Game, mage.abilities.Ability) apply} method
* invocation.
* *
* @param filter * @param filter
* @param type * @param type
@ -83,10 +84,10 @@ public class PermanentsOnTheBattlefieldCondition implements Condition {
} }
/** /**
* Applies a filter, a {@link ComparisonType}, and count to permanents on the * Applies a filter, a {@link ComparisonType}, and count to permanents on
* battlefield and calls the decorated condition to see if it * the battlefield and calls the decorated condition to see if it
* {@link #apply(mage.game.Game, mage.abilities.Ability) applies} * {@link #apply(mage.game.Game, mage.abilities.Ability) applies} as well.
* as well. This will force both conditions to apply for this to be true. * This will force both conditions to apply for this to be true.
* *
* @param filter * @param filter
* @param type * @param type
@ -100,7 +101,7 @@ public class PermanentsOnTheBattlefieldCondition implements Condition {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
boolean conditionApplies = false; boolean conditionApplies;
FilterPermanent localFilter = filter.copy(); FilterPermanent localFilter = filter.copy();
if (onlyControlled) { if (onlyControlled) {

2
Mage/src/main/java/mage/players/net/UserData.java
View file

@ -75,7 +75,7 @@ public class UserData implements Serializable {
this.autoOrderTrigger = userData.autoOrderTrigger; this.autoOrderTrigger = userData.autoOrderTrigger;
this.useFirstManaAbility = userData.useFirstManaAbility; this.useFirstManaAbility = userData.useFirstManaAbility;
this.userIdStr = userData.userIdStr; this.userIdStr = userData.userIdStr;
// todo: why we don't copy user stats here? // todo: why we don't update user stats here? => can't be updated from client side
} }
public static UserData getDefaultUserDataView() { public static UserData getDefaultUserDataView() {