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

Merge branch 'fixmp' into 'master'

Browse Source 
Fix Multiplayer LTB triggers

Closes #1324

See merge request core-developers/forge!4511
This commit is contained in:
Michael Kamensky
2021-04-16 04:59:35 +00:00
parent 2a2c12cf77 237b0324c1
commit 59f414f707
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -1029,7 +1029,7 @@ public class PlayerControllerAi extends PlayerController {
*/
if (sa.isMayChooseNewTargets() && !sa.setupTargets()) {
if (sa.isSpell()) {
sa.getHostCard().ceaseToExist();
sa.getHostCard().ceaseToExist(false);
}
continue;
}

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

@@ -769,12 +769,19 @@ public class Game {
p.revealFaceDownCards();
}
for(Card c : cards) {
for (Card c : cards) {
// CR 800.4d if card is controlled by opponent, LTB should trigger
if (c.getOwner().equals(p) && c.getController().equals(p)) {
c.getCurrentState().clearTriggers();
}
}
for (Card c : cards) {
if (c.getController().equals(p) && (c.isPlane() || c.isPhenomenon())) {
planarControllerLost = true;
}
if(isMultiplayer) {
if (isMultiplayer) {
// unattach all "Enchant Player"
c.removeAttachedTo(p);
if (c.getOwner().equals(p)) {
@@ -783,7 +790,9 @@ public class Game {
cc.removeEncodedCard(c);
cc.removeRemembered(c);
}
c.ceaseToExist();
c.ceaseToExist(false);
// CR 603.2f owner of trigger source lost game
triggerHandler.clearDelayedTrigger(c);
} else {
// return stolen permanents
if (c.getController().equals(p) && c.isInZone(ZoneType.Battlefield)) {

14
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6756,11 +6756,15 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
}
}
public void ceaseToExist() {
getGame().getTriggerHandler().suppressMode(TriggerType.ChangesZone);
getZone().remove(this);
setZone(null);
getGame().getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
public void ceaseToExist(boolean skipTrig) {
// CR 603.6c other players LTB triggers should work
if (skipTrig) {
getZone().remove(this);
setZone(getOwner().getZone(ZoneType.None));
}
else {
game.getAction().moveTo(ZoneType.None, this, null);
}
}
public void forceTurnFaceUp() {

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -133,7 +133,7 @@ import forge.util.collect.FCollectionView;
public class Player extends GameEntity implements Comparable<Player> {
public static final List<ZoneType> ALL_ZONES = Collections.unmodifiableList(Arrays.asList(ZoneType.Battlefield,
ZoneType.Library, ZoneType.Graveyard, ZoneType.Hand, ZoneType.Exile, ZoneType.Command, ZoneType.Ante,
ZoneType.Sideboard, ZoneType.PlanarDeck, ZoneType.SchemeDeck, ZoneType.Merged, ZoneType.Subgame));
ZoneType.Sideboard, ZoneType.PlanarDeck, ZoneType.SchemeDeck, ZoneType.Merged, ZoneType.Subgame, ZoneType.None));
private final Map<Card, Integer> commanderDamage = Maps.newHashMap();

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

@@ -2361,7 +2361,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
public void rollback() {
for (Card c : rollbackEffects) {
c.ceaseToExist();
c.ceaseToExist(true);
}
rollbackEffects.clear();
}

11
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -631,13 +631,12 @@ public class TriggerHandler {
}
public void onPlayerLost(Player p) {
List<Trigger> lost = new ArrayList<>();
for (Trigger t : delayedTriggers) {
// CR 603.2f owner of trigger source lost game || 800.4d trigger controller lost game
if (game.getCardState(t.getHostCard(), null) == null || t.getHostCard().getOwner().equals(p)) {
lost.add(t);
List<Trigger> lost = new ArrayList<>(delayedTriggers);
for (Trigger t : lost) {
// CR 800.4d trigger controller lost game
if (t.getHostCard().getOwner().equals(p)) {
delayedTriggers.remove(t);
}
}
delayedTriggers.removeAll(lost);
}
}

2
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -586,7 +586,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
}
if (source.isCopiedSpell() && source.isInZone(ZoneType.Stack)) {
source.ceaseToExist();
source.ceaseToExist(true);
return;
}

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -2841,7 +2841,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
continue;
}
c.getZone().remove(c);
c.ceaseToExist();
c.ceaseToExist(true);
StringBuilder sb = new StringBuilder();
sb.append(p).append(" removes ").append(c).append(" from game due to Dev Cheats.");