External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 13:19:18 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed a bug introduced with TargetSource() fix.

Browse source
This commit is contained in:
LevelX2 2014-07-25 14:43:13 +02:00
parent 54570bac59
commit 7f6d5bcac6
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/mage/target/TargetImpl.java
View file

@ -228,8 +228,8 @@ public abstract class TargetImpl implements Target {
//20100423 - 113.3
if (maxNumberOfTargets == 0 || targets.size() < maxNumberOfTargets) {
if (!targets.containsKey(id)) {
if (source != null) {
if (!skipEvent && !game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) {
if (source != null && !skipEvent) {
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) {
targets.put(id, 0);
rememberZoneChangeCounter(id, game);
chosen = targets.size() >= minNumberOfTargets;
@ -237,8 +237,7 @@ public abstract class TargetImpl implements Target {
game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId()));
}
}
}
else {
} else {
targets.put(id, 0);
}
}
@ -267,8 +266,8 @@ public abstract class TargetImpl implements Target {
if (targets.containsKey(id)) {
amount += targets.get(id);
}
if (source != null) {
if (!skipEvent && !game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getId(), source.getControllerId()))) {
if (source != null && !skipEvent) {
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getId(), source.getControllerId()))) {
targets.put(id, amount);
rememberZoneChangeCounter(id, game);
chosen = targets.size() >= minNumberOfTargets;
@ -276,8 +275,7 @@ public abstract class TargetImpl implements Target {
game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getId(), source.getControllerId()));
}
}
}
else {
} else {
targets.put(id, amount);
rememberZoneChangeCounter(id, game);
}