External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6251 from Dilnu/Bonecrusher

Browse source 
Only fire one TARGETTED event per target selected while changing targets.
This commit is contained in:
Oleg Agafonov 2020-02-08 16:31:04 +01:00 • committed by GitHub
commit 6674ca5d20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 123 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/game/stack/StackObjImpl.java
View file

@ -151,6 +151,7 @@ public abstract class StackObjImpl implements StackObject {
*/
private Target chooseNewTarget(Player targetController, Ability ability, Mode mode, Target target, boolean forceChange, FilterPermanent filterNewTarget, Game game) {
Target newTarget = target.copy();
newTarget.setEventReporting(false);
if (!targetController.getId().equals(getControllerId())) {
newTarget.setTargetController(targetController.getId()); // target controller for the change is different from spell controller
newTarget.setAbilityController(getControllerId());
@ -199,6 +200,7 @@ public abstract class StackObjImpl implements StackObject {
} else {
// build a target definition with exactly one possible target to select that replaces old target
Target tempTarget = target.copy();
tempTarget.setEventReporting(false);
if (target instanceof TargetAmount) {
((TargetAmount) tempTarget).setAmountDefinition(StaticValue.get(target.getTargetAmount(targetId)));
}
@ -215,7 +217,7 @@ public abstract class StackObjImpl implements StackObject {
if (!tempTarget.chooseTarget(outcome, getControllerId(), ability, game)) {
if (targetController.chooseUse(Outcome.Benefit, "No target object selected. Reset to original target?", ability, game)) {
// use previous target no target was selected
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, true);
} else {
again = true;
}
@ -225,12 +227,12 @@ public abstract class StackObjImpl implements StackObject {
if (targetController.isHuman()) {
if (targetController.chooseUse(Outcome.Benefit, "This target was already selected from origin spell. Reset to original target?", ability, game)) {
// use previous target no target was selected
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, true);
} else {
again = true;
}
} else {
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, true);
}
} else if (!target.canTarget(getControllerId(), tempTarget.getFirstTarget(), ability, game)) {
if (targetController.isHuman()) {
@ -238,7 +240,7 @@ public abstract class StackObjImpl implements StackObject {
again = true;
} else {
// keep the old
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, true);
}
} else if (newTarget.getFirstTarget() != null && filterNewTarget != null) {
Permanent newTargetPermanent = game.getPermanent(newTarget.getFirstTarget());
@ -248,14 +250,14 @@ public abstract class StackObjImpl implements StackObject {
}
} else {
// valid target was selected, add it to the new target definition
newTarget.addTarget(tempTarget.getFirstTarget(), target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(tempTarget.getFirstTarget(), target.getTargetAmount(targetId), ability, game, true);
}
}
} while (again && targetController.canRespond());
}
} // keep the target
else {
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, false);
newTarget.addTarget(targetId, target.getTargetAmount(targetId), ability, game, true);
}
}
return newTarget;

2
Mage/src/main/java/mage/target/Target.java
View file

@ -136,4 +136,6 @@ public interface Target extends Serializable {
void setTargetAmount(UUID targetId, int amount, Game game);
Target withChooseHint(String chooseHint);
void setEventReporting(boolean shouldReport);
}

15
Mage/src/main/java/mage/target/TargetImpl.java
View file

@ -37,6 +37,7 @@ public abstract class TargetImpl implements Target {
protected int targetTag; // can be set if other target check is needed (AnotherTargetPredicate)
protected String chooseHint = null; // UI choose hints after target name
protected boolean shouldReportEvents = true;
@Override
public abstract TargetImpl copy();
@ -65,6 +66,7 @@ public abstract class TargetImpl implements Target {
this.abilityController = target.abilityController;
this.targetTag = target.targetTag;
this.chooseHint = target.chooseHint;
this.shouldReportEvents = target.shouldReportEvents;
}
@Override
@ -213,12 +215,12 @@ public abstract class TargetImpl implements Target {
//20100423 - 113.3
if (getMaxNumberOfTargets() == 0 || targets.size() < getMaxNumberOfTargets()) {
if (!targets.containsKey(id)) {
if (source != null && !skipEvent) {
if (source != null && !skipEvent && shouldReportEvents) {
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) {
targets.put(id, 0);
rememberZoneChangeCounter(id, game);
chosen = targets.size() >= getNumberOfTargets();
if (!skipEvent) {
if (!skipEvent && shouldReportEvents) {
game.addSimultaneousEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId()));
}
}
@ -251,12 +253,12 @@ public abstract class TargetImpl implements Target {
if (targets.containsKey(id)) {
amount += targets.get(id);
}
if (source != null && !skipEvent) {
if (source != null && !skipEvent && shouldReportEvents) {
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) {
targets.put(id, amount);
rememberZoneChangeCounter(id, game);
chosen = targets.size() >= getNumberOfTargets();
if (!skipEvent) {
if (!skipEvent && shouldReportEvents) {
game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId()));
}
}
@ -551,4 +553,9 @@ public abstract class TargetImpl implements Target {
this.chooseHint = chooseHint;
return this;
}
@Override
public void setEventReporting(boolean shouldReport) {
this.shouldReportEvents = shouldReport;
}
}