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

fix Melee ability not working (fixes #9848, fixes #10098)

Browse source
This commit is contained in:
theelk801 2023-04-19 20:49:47 -04:00
parent 771d0bfdf1
commit a46dbf602f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/abilities/keyword/MeleeAbility.java
View file

@ -19,7 +19,7 @@ import java.util.*;
public class MeleeAbility extends AttacksTriggeredAbility {
public MeleeAbility() {
super(new BoostSourceEffect(MeleeDynamicValue.instance, MeleeDynamicValue.instance, Duration.EndOfTurn), false);
super(new BoostSourceEffect(MeleeDynamicValue.instance, MeleeDynamicValue.instance, Duration.EndOfTurn, true), false);
this.addWatcher(new MeleeWatcher());
}
@ -53,7 +53,7 @@ class MeleeWatcher extends Watcher {
this.playersAttacked.clear();
return;
case ATTACKER_DECLARED:
if (game.getPlayer(event.getTargetId()) == null) {
if (!game.getOpponents(event.getPlayerId()).contains(event.getTargetId())) {
return;
}
this.playersAttacked
@ -62,7 +62,7 @@ class MeleeWatcher extends Watcher {
}
}
public static int getNumberOfAttackedPlayers(UUID attackerId, Game game) {
static int getNumberOfAttackedPlayers(UUID attackerId, Game game) {
return game
.getState()
.getWatcher(MeleeWatcher.class)
@ -77,7 +77,7 @@ enum MeleeDynamicValue implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
return MeleeWatcher.getNumberOfAttackedPlayers(sourceAbility.getSourceId(), game);
return MeleeWatcher.getNumberOfAttackedPlayers(sourceAbility.getControllerId(), game);
}
@Override