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

Fix effects that have a player attack a certain GameEntity (like Gideon Jura, Taunt).

Browse Source
This commit is contained in:
elcnesh
2014-07-30 09:51:24 +00:00
parent db07b734a1
commit fb03ed6654
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java
View File

@@ -46,11 +46,14 @@ public class MustAttackEffect extends SpellAbilityEffect {
for (final Player p : tgtPlayers) {
if ((tgt == null) || p.canBeTargetedBy(sa)) {
GameEntity entity;
if (sa.getParam("Defender").equals("Self")) {
final String defender = sa.getParam("Defender");
final GameEntity entity;
if (defender.equals("Self")) {
entity = sa.getHostCard();
} else if (defender.equals("You")) {
entity = sa.getActivatingPlayer();
} else {
entity = p.getOpponent();
throw new RuntimeException("Illegal defender " + defender + " for MustAttackEffect in card " + sa.getHostCard());
}
// System.out.println("Setting mustAttackEntity to: "+entity);
p.setMustAttackEntity(entity);

4
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -734,6 +734,10 @@ public class CombatUtil {
final int cntAttackers = combat.getAttackers().size();
final Game game = c.getGame();
if (c.getController().getMustAttackEntity() != def) {
return false;
}
if (cntAttackers > 0) {
for (final Card card : game.getCardsIn(ZoneType.Battlefield)) {
for (final String keyword : card.getKeyword()) {