github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Commander - Fixed a NPE if change control effects are used during commander game.

Browse source
This commit is contained in:
LevelX2 2013-11-22 00:30:14 +01:00
parent e95cb7ee32
commit 6d0b38c8ca
4 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuel.java
View file

@ -56,7 +56,7 @@ import mage.watchers.common.CommanderCombatDamageWatcher;
public class CommanderDuel extends GameImpl<CommanderDuel> {
private Map<UUID, Cards> mulliganedCards = new HashMap<UUID, Cards>();
private final Map<UUID, Cards> mulliganedCards = new HashMap<UUID, Cards>();
public CommanderDuel(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans) {
super(attackOption, range, freeMulligans);
@ -106,7 +106,7 @@ public class CommanderDuel extends GameImpl<CommanderDuel> {
}
}
this.getState().addAbility(ability, null, null);
this.getState().addAbility(ability, this.getId(), null);
state.getTurnMods().add(new TurnMod(startingPlayerId, PhaseStep.DRAW));
}

4
Mage/src/mage/abilities/dynamicvalue/common/ManaSpentToCastCount.java
View file

@ -59,6 +59,10 @@ public class ManaSpentToCastCount implements DynamicValue{
return new ManaSpentToCastCount();
}
@Override
public String toString() {
return "X";
}
@Override
public String getMessage() {

26
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -56,6 +56,7 @@ import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SpellAbilityType;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
@ -65,6 +66,7 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetCardInHand;
import org.apache.log4j.Logger;
/**
*
@ -72,6 +74,8 @@ import mage.target.common.TargetCardInHand;
*/
public class ContinuousEffects implements Serializable {
private static final transient Logger logger = Logger.getLogger(ContinuousEffects.class);
private Date lastSetTimestamp;
//transient Continuous effects
@ -81,20 +85,19 @@ public class ContinuousEffects implements Serializable {
private ContinuousEffectsList<RequirementEffect> requirementEffects = new ContinuousEffectsList<RequirementEffect>();
private ContinuousEffectsList<RestrictionEffect> restrictionEffects = new ContinuousEffectsList<RestrictionEffect>();
private ContinuousEffectsList<RestrictionUntapNotMoreThanEffect> restrictionUntapNotMoreThanEffects = new ContinuousEffectsList<RestrictionUntapNotMoreThanEffect>();
private Map<AsThoughEffectType, ContinuousEffectsList<AsThoughEffect>> asThoughEffectsMap = new EnumMap<AsThoughEffectType, ContinuousEffectsList<AsThoughEffect>>(AsThoughEffectType.class);
private ContinuousEffectsList<CostModificationEffect> costModificationEffects = new ContinuousEffectsList<CostModificationEffect>();
private ContinuousEffectsList<SpliceCardEffect> spliceCardEffects = new ContinuousEffectsList<SpliceCardEffect>();
private List<ContinuousEffectsList<?>> allEffectsLists = new ArrayList<ContinuousEffectsList<?>>();
private final Map<AsThoughEffectType, ContinuousEffectsList<AsThoughEffect>> asThoughEffectsMap = new EnumMap<AsThoughEffectType, ContinuousEffectsList<AsThoughEffect>>(AsThoughEffectType.class);
private final List<ContinuousEffectsList<?>> allEffectsLists = new ArrayList<ContinuousEffectsList<?>>();
private final ApplyCountersEffect applyCounters;
private final PlaneswalkerRedirectionEffect planeswalkerRedirectionEffect;
private final AuraReplacementEffect auraReplacementEffect;
private List<ContinuousEffect> previous = new ArrayList<ContinuousEffect>();
private final List<ContinuousEffect> previous = new ArrayList<ContinuousEffect>();
// effect.id -> sourceId - which effect was added by which sourceId
private Map<UUID, UUID> sources = new HashMap<UUID, UUID>();
private final Map<UUID, UUID> sources = new HashMap<UUID, UUID>();
public ContinuousEffects() {
applyCounters = new ApplyCountersEffect();
@ -474,7 +477,6 @@ public class ContinuousEffects implements Serializable {
*
* @param abilityToModify
* @param game
* @return
*/
public void costModification ( Ability abilityToModify, Game game ) {
List<CostModificationEffect> costEffects = getApplicableCostModificationEffects(game);
@ -518,7 +520,6 @@ public class ContinuousEffects implements Serializable {
*
* @param abilityToModify
* @param game
* @return
*/
public void applySpliceEffects ( Ability abilityToModify, Game game ) {
if ( ((SpellAbility) abilityToModify).getSpellAbilityType().equals(SpellAbilityType.SPLICE)) {
@ -832,8 +833,14 @@ public class ContinuousEffects implements Serializable {
for (Effect effect : effects) {
HashSet<Ability> abilities = effects.getAbility(effect.getId());
for (Ability ability : abilities) {
if (ability.getSourceId().equals(cardId)) {
ability.setControllerId(controllerId);
if (ability.getSourceId() != null) {
if (ability.getSourceId().equals(cardId)) {
ability.setControllerId(controllerId);
}
} else {
if (!ability.getZone().equals(Zone.COMMAND)) {
logger.fatal(new StringBuilder("No sourceId Ability: ").append(ability));
}
}
}
}
@ -851,6 +858,7 @@ public class ContinuousEffects implements Serializable {
* Removes effects granted by sourceId
*
* @param sourceId
* @return
*/
public List<Effect> removeGainedEffectsForSource(UUID sourceId) {
List<Effect> effects = new ArrayList<Effect>();

15
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -29,17 +29,24 @@
package mage.game.combat;
import java.io.Serializable;
import java.util.*;
import mage.constants.Outcome;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.abilities.common.DamageAsThoughNotBlockedAbility;
import mage.abilities.keyword.*;
import mage.abilities.keyword.CantBlockAloneAbility;
import mage.abilities.keyword.DeathtouchAbility;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.Copyable;
/**
*
* @author BetaSteward_at_googlemail.com