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

[SWS] Fixed some problems.

Browse source
This commit is contained in:
LevelX2 2016-10-02 22:50:34 +02:00
parent da685472d8
commit 6554102367
7 changed files with 36 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/condition/common/HateCondition.java
View file

@ -55,7 +55,7 @@ public class HateCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
LifeLossOtherFromCombatWatcher watcher = (LifeLossOtherFromCombatWatcher) game.getState().getWatchers().get(LifeLossOtherFromCombatWatcher.class.getName());
return watcher != null && watcher.opponentLostLifeOtherFromCombat(source.getControllerId());
return watcher != null && watcher.opponentLostLifeOtherFromCombat(source.getControllerId(), game);
}
@Override

16
Mage/src/main/java/mage/abilities/costs/common/DiscardTargetCost.java
View file

@ -75,16 +75,14 @@ public class DiscardTargetCost extends CostImpl {
int amount = this.getTargets().get(0).getNumberOfTargets();
if (randomDiscard) {
this.cards.addAll(player.discard(amount, true, ability, game).getCards(game));
} else {
if (targets.choose(Outcome.Discard, controllerId, sourceId, game)) {
for (UUID targetId : targets.get(0).getTargets()) {
Card card = player.getHand().get(targetId, game);
if (card == null) {
return false;
}
player.discard(card, ability, game);
this.cards.add(card);
} else if (targets.choose(Outcome.Discard, controllerId, sourceId, game)) {
for (UUID targetId : targets.get(0).getTargets()) {
Card card = player.getHand().get(targetId, game);
if (card == null) {
return false;
}
player.discard(card, ability, game);
this.cards.add(card);
}
}
paid = cards.size() >= amount;

4
Mage/src/main/java/mage/abilities/keyword/RepairAbility.java
View file

@ -55,6 +55,10 @@ public class RepairAbility extends DiesTriggeredAbility {
return ruleText;
}
@Override
public RepairAbility copy() {
return new RepairAbility(this);
}
}
class RepairCastFromGraveyardEffect extends AsThoughEffectImpl {

12
Mage/src/main/java/mage/watchers/common/LifeLossOtherFromCombatWatcher.java
View file

@ -33,6 +33,7 @@ import java.util.UUID;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import mage.watchers.Watcher;
/*
@ -61,9 +62,14 @@ public class LifeLossOtherFromCombatWatcher extends Watcher {
}
}
public boolean opponentLostLifeOtherFromCombat(UUID playerId) {
return (!players.contains(playerId) && players.size() > 0)
|| (players.contains(playerId) && players.size() > 1);
public boolean opponentLostLifeOtherFromCombat(UUID playerId, Game game) {
Player player = game.getPlayer(playerId);
if (player != null) {
if (players.stream().anyMatch((damagedPlayerId) -> (player.hasOpponent(damagedPlayerId, game)))) {
return true;
}
}
return false;
}
@Override