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

Some fixes (#5699)

Browse Source
This commit is contained in:
tool4ever
2024-07-27 07:53:00 +00:00
committed by GitHub
parent 27ed942d26
commit 76b3f6fbb7
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -20,7 +20,6 @@ import forge.game.combat.AttackRequirement;
import forge.game.combat.AttackingBand;
import forge.game.combat.Combat;
import forge.game.combat.CombatUtil;
import forge.game.keyword.Keyword;
import forge.game.keyword.KeywordInterface;
import forge.game.mana.Mana;
import forge.game.player.Player;
@@ -637,9 +636,6 @@ public class CardProperty {
if (property.endsWith("With") && card.getPairedWith() != source) {
return false;
}
if (property.endsWith("Soulbond") && !card.getPairedWith().hasKeyword(Keyword.SOULBOND)) {
return false;
}
} else if (property.startsWith("Above")) { // "Are Above" Source
final CardCollectionView cards = card.getOwner().getCardsIn(ZoneType.Graveyard);
if (cards.indexOf(source) >= cards.indexOf(card)) {

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

@@ -812,14 +812,14 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
// Grab players in turn order starting with the active player
List<Player> players = game.getPlayersInTurnOrder(playerTurn);
for(Player p : players) {
for (Player p : players) {
if (p.hasLost()) {
continue;
}
result |= chooseOrderOfSimultaneousStackEntry(p, false);
}
for(Player p : players) {
for (Player p : players) {
if (p.hasLost()) {
continue;
}