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

Merge pull request #4139 from Zzooouhh/master

Browse source 
Implemented a whole bunch of cards + fixes for #4131, #4137, #4138 and #4090
This commit is contained in:
LevelX2 2017-11-02 14:08:26 +01:00 • committed by GitHub
commit 583033ff3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 2235 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/effects/common/RedirectDamageFromSourceToTargetEffect.java
View file

@ -10,6 +10,7 @@ import mage.abilities.effects.RedirectionEffect;
import mage.constants.Duration;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
@ -33,9 +34,14 @@ public class RedirectDamageFromSourceToTargetEffect extends RedirectionEffect {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getTargetId().equals(source.getSourceId())) {
this.redirectTarget = source.getTargets().get(0);
return true;
Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
if (permanent != null) {
if (event.getTargetId().equals(source.getSourceId())) {
if (getTargetPointer().getFirst(game, source) != null) {
this.redirectTarget = source.getTargets().get(0);
return true;
}
}
}
return false;
}

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

@ -47,7 +47,7 @@ import mage.watchers.Watcher;
*
* @author emerald000
*/
public class MeleeAbility extends AttacksTriggeredAbility {
public class MeleeAbility extends AttacksTriggeredAbility {
public MeleeAbility() {
super(new BoostSourceEffect(new MeleeDynamicValue(), new MeleeDynamicValue(), Duration.EndOfTurn), false);
@ -71,7 +71,7 @@ public class MeleeAbility extends AttacksTriggeredAbility {
class MeleeWatcher extends Watcher {
private final HashMap<UUID, Set<UUID>> playersAttacked = new HashMap<>(0);
private HashMap<UUID, Set<UUID>> playersAttacked = new HashMap<>(0);
MeleeWatcher() {
super("MeleeWatcher", WatcherScope.GAME);
@ -95,7 +95,10 @@ class MeleeWatcher extends Watcher {
}
public int getNumberOfAttackedPlayers(UUID attackerId) {
return this.playersAttacked.get(attackerId).size();
if (this.playersAttacked.get(attackerId) != null) {
return this.playersAttacked.get(attackerId).size();
}
return 0;
}
@Override
@ -106,11 +109,18 @@ class MeleeWatcher extends Watcher {
class MeleeDynamicValue implements DynamicValue {
private boolean valueChecked = false;
private int lockedInValue;
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
MeleeWatcher watcher = (MeleeWatcher) game.getState().getWatchers().get(MeleeWatcher.class.getSimpleName());
if (watcher != null) {
return watcher.getNumberOfAttackedPlayers(sourceAbility.getControllerId());
if (!valueChecked) {
this.lockedInValue = watcher.getNumberOfAttackedPlayers(sourceAbility.getControllerId());
valueChecked = true;
}
return this.lockedInValue;
}
return 0;
}