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

* Slice onto arcane - Fixed a bug that splice cards of opponents were counted as own splice cards. Leading to lock down the client.

Browse source
This commit is contained in:
LevelX2 2013-06-29 20:50:13 +02:00
parent 63783d9fe2
commit 3572cbdc87
1 changed files with 3 additions and 3 deletions

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

@ -351,13 +351,13 @@ public class ContinuousEffects implements Serializable {
* @param game * @param game
* @return * @return
*/ */
private List<SpliceCardEffect> getApplicableSpliceCardEffects(Game game) { private List<SpliceCardEffect> getApplicableSpliceCardEffects(Game game, UUID playerId) {
List<SpliceCardEffect> spliceEffects = new ArrayList<SpliceCardEffect>(); List<SpliceCardEffect> spliceEffects = new ArrayList<SpliceCardEffect>();
for (SpliceCardEffect effect: spliceCardEffects) { for (SpliceCardEffect effect: spliceCardEffects) {
HashSet<Ability> abilities = spliceCardEffects.getAbility(effect.getId()); HashSet<Ability> abilities = spliceCardEffects.getAbility(effect.getId());
for (Ability ability : abilities) { for (Ability ability : abilities) {
if (!(ability instanceof StaticAbility) || ability.isInUseableZone(game, null, false)) { if (ability.getControllerId().equals(playerId) && (!(ability instanceof StaticAbility) || ability.isInUseableZone(game, null, false))) {
if (effect.getDuration() != Duration.OneUse || !effect.isUsed()) { if (effect.getDuration() != Duration.OneUse || !effect.isUsed()) {
spliceEffects.add(effect); spliceEffects.add(effect);
break; break;
@ -442,7 +442,7 @@ public class ContinuousEffects implements Serializable {
// on a spliced ability of a spell can't be spliced again // on a spliced ability of a spell can't be spliced again
return; return;
} }
List<SpliceCardEffect> spliceEffects = getApplicableSpliceCardEffects(game); List<SpliceCardEffect> spliceEffects = getApplicableSpliceCardEffects(game, abilityToModify.getControllerId());
// get the applyable splice abilities // get the applyable splice abilities
List<SpliceOntoArcaneAbility> spliceAbilities = new ArrayList<SpliceOntoArcaneAbility>(); List<SpliceOntoArcaneAbility> spliceAbilities = new ArrayList<SpliceOntoArcaneAbility>();
for (SpliceCardEffect effect : spliceEffects) { for (SpliceCardEffect effect : spliceEffects) {