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

Fix DIE_ROLLED event to set targetID to player who rolled the die (#11993)

Browse source 
* Fix DIE_ROLLED event to set targetID to player who rolled the die

* Fix DieRolledEvent instantiation
This commit is contained in:
jimga150 2024-03-25 21:34:42 -04:00 • committed by GitHub
parent 50d8be1924
commit c8383649df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/AsLuckWouldHaveIt.java
View file

@ -74,7 +74,7 @@ class AsLuckWouldHaveItTriggeredAbility extends TriggeredAbilityImpl {
// Any die roll with a numerical result will add luck counters to As Luck Would Have It.
// Rolling the planar die will not cause the second ability to trigger.
// (2018-01-19)
if (this.isControlledBy(event.getPlayerId()) && drEvent.getRollDieType() == RollDieType.NUMERICAL) {
if (this.isControlledBy(event.getTargetId()) && drEvent.getRollDieType() == RollDieType.NUMERICAL) {
// silver border card must look for "result" instead "natural result"
this.getEffects().setValue("rolled", drEvent.getResult());
return true;

2
Mage.Sets/src/mage/cards/c/ChitteringDoom.java
View file

@ -60,7 +60,7 @@ class ChitteringDoomTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
// silver border card must look for "result" instead "natural result"
return this.isControlledBy(event.getPlayerId()) && drEvent.getResult() >= 4;
return this.isControlledBy(event.getTargetId()) && drEvent.getResult() >= 4;
}
@Override

2
Mage.Sets/src/mage/cards/c/CriticalHit.java
View file

@ -62,7 +62,7 @@ class CriticalHitTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
return isControlledBy(event.getPlayerId())
return isControlledBy(event.getTargetId())
&& drEvent.getNaturalResult() == 20;
}

2
Mage.Sets/src/mage/cards/g/GroundPounder.java
View file

@ -104,7 +104,7 @@ class GroundPounderTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
// silver border card must look for "result" instead "natural result"
return this.isControlledBy(event.getPlayerId()) && drEvent.getResult() >= 5;
return this.isControlledBy(event.getTargetId()) && drEvent.getResult() >= 5;
}
@Override

2
Mage.Sets/src/mage/cards/h/HammerJammer.java
View file

@ -110,7 +110,7 @@ class HammerJammerTriggeredAbility extends TriggeredAbilityImpl {
DieRolledEvent drEvent = (DieRolledEvent) event;
// silver border card must look for "result" instead "natural result"
// planar die will trigger it with 0 amount
if (this.isControlledBy(drEvent.getPlayerId())) {
if (this.isControlledBy(drEvent.getTargetId())) {
this.getEffects().setValue("rolled", drEvent.getResult());
return true;
}

2
Mage.Sets/src/mage/cards/m/MonoxaMidwayManager.java
View file

@ -77,7 +77,7 @@ class MonoxaMidwayManagerTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
int result = ((DieRolledEvent) event).getResult();
if (!isControlledBy(event.getPlayerId()) || result < 3) {
if (!isControlledBy(event.getTargetId()) || result < 3) {
return false;
}
this.getEffects().setValue("dieRoll", result);

2
Mage.Sets/src/mage/cards/m/MrHousePresidentAndCEO.java
View file

@ -77,7 +77,7 @@ class MrHousePresidentAndCEOTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
if (this.isControlledBy(event.getPlayerId()) && drEvent.getRollDieType() == RollDieType.NUMERICAL) {
if (this.isControlledBy(event.getTargetId()) && drEvent.getRollDieType() == RollDieType.NUMERICAL) {
// looks for "result" instead "natural result"
int result = drEvent.getResult();
this.getEffects().setValue("rolled", result);

2
Mage.Sets/src/mage/cards/n/NetheresePuzzleWard.java
View file

@ -91,7 +91,7 @@ class NetheresePuzzleWardTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
return isControlledBy(drEvent.getPlayerId())
return isControlledBy(drEvent.getTargetId())
&& drEvent.getNaturalResult() == drEvent.getSides();
}

2
Mage.Sets/src/mage/cards/s/SteelSquirrel.java
View file

@ -75,7 +75,7 @@ class SteelSquirrelTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
// silver border card must look for "result" instead "natural result"
if (this.isControlledBy(event.getPlayerId()) && drEvent.getResult() < 5) {
if (this.isControlledBy(event.getTargetId()) && drEvent.getResult() < 5) {
return false;
}

4
Mage.Sets/src/mage/cards/t/TheSpaceFamilyGoblinson.java
View file

@ -104,7 +104,7 @@ class TheSpaceFamilyGoblinsonWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.DIE_ROLLED) {
map.compute(event.getPlayerId(), CardUtil::setOrIncrementValue);
map.compute(event.getTargetId(), CardUtil::setOrIncrementValue);
}
}
@ -146,7 +146,7 @@ class TheSpaceFamilyGoblinsonTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return isControlledBy(event.getPlayerId());
return isControlledBy(event.getTargetId());
}
}

2
Mage.Sets/src/mage/cards/w/WillingTestSubject.java
View file

@ -80,7 +80,7 @@ class WillingTestSubjectTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
DieRolledEvent drEvent = (DieRolledEvent) event;
// silver border card must look for "result" instead "natural result"
return this.isControlledBy(event.getPlayerId()) && drEvent.getResult() >= 4;
return this.isControlledBy(event.getTargetId()) && drEvent.getResult() >= 4;
}
@Override

20
Mage/src/main/java/mage/game/events/DieRolledEvent.java
View file

@ -4,6 +4,8 @@ import mage.abilities.Ability;
import mage.constants.PlanarDieRollResult;
import mage.constants.RollDieType;
import java.util.UUID;
/**
* @author TheElk801, JayDi85
*/
@ -20,8 +22,22 @@ public class DieRolledEvent extends GameEvent {
private final int naturalResult; // planar die returns 0 values in result and natural result
private final PlanarDieRollResult planarResult;
public DieRolledEvent(Ability source, RollDieType rollDieType, int sides, int naturalResult, int modifier, PlanarDieRollResult planarResult) {
super(EventType.DIE_ROLLED, source.getControllerId(), source, source.getControllerId(), naturalResult + modifier, false);
/**
* The target ID is used to keep track of the distinction between the player who controls the ability that
* started the dice roll and the player who does the rolling.
* <p>
* The only times this distinction matters is for Chaos Dragon and Ricochet.
*
* @param source The ability causing the die roll
* @param targetId The player who rolled the die
* @param rollDieType
* @param sides
* @param naturalResult the result of the die roll before any modifiers
* @param modifier the sum of all modifiers
* @param planarResult
*/
public DieRolledEvent(Ability source, UUID targetId, RollDieType rollDieType, int sides, int naturalResult, int modifier, PlanarDieRollResult planarResult) {
super(EventType.DIE_ROLLED, targetId, source, source.getControllerId(), naturalResult + modifier, false);
this.rollDieType = rollDieType;
this.sides = sides;
this.naturalResult = naturalResult;

2
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -3293,7 +3293,7 @@ public abstract class PlayerImpl implements Player, Serializable {
// raise affected roll events
for (RollDieResult result : dieRolls) {
game.fireEvent(new DieRolledEvent(source, rollDiceEvent.getRollDieType(), rollDiceEvent.getSides(), result.naturalResult, result.modifier, result.planarResult));
game.fireEvent(new DieRolledEvent(source, this.getId(), rollDiceEvent.getRollDieType(), rollDiceEvent.getSides(), result.naturalResult, result.modifier, result.planarResult));
}
game.fireEvent(new DiceRolledEvent(rollDiceEvent.getSides(), dieResults, source, this.getId()));

2
Mage/src/main/java/mage/watchers/common/PlanarRollWatcher.java
View file

@ -29,7 +29,7 @@ public class PlanarRollWatcher extends Watcher {
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.DIE_ROLLED) {
DieRolledEvent drEvent = (DieRolledEvent) event;
UUID playerId = drEvent.getPlayerId();
UUID playerId = drEvent.getTargetId();
if (playerId != null && drEvent.getRollDieType() == RollDieType.PLANAR) {
Integer amount = numberTimesPlanarDieRolled.get(playerId);
if (amount == null) {