external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'simfix' into 'master'

Browse Source 
Simulation: fix wrong ActivatingPlayer

See merge request core-developers/forge!6420
This commit is contained in:
Michael Kamensky
2022-03-21 03:49:17 +00:00
parent 678d0a0f85 d3cf93fe23
commit 968ab925e7
5 changed files with 74 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/Game.java
View File

@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import forge.game.event.GameEventDayTimeChanged;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.base.Predicate;
@@ -55,6 +54,7 @@ import forge.game.card.CardView;
import forge.game.card.CounterType;
import forge.game.combat.Combat;
import forge.game.event.Event;
import forge.game.event.GameEventDayTimeChanged;
import forge.game.event.GameEventGameOutcome;
import forge.game.phase.Phase;
import forge.game.phase.PhaseHandler;

3
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -434,7 +434,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
public boolean setActivatingPlayer(final Player player, final boolean lki) {
// trickle down activating player
boolean updated = false;
if (player == null || !player.equals(activatingPlayer)) {
// don't use equals because player might be from simulation
if (player == null || player != activatingPlayer) {
activatingPlayer = player;
updated = true;
}