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

Player: canPlayLand use the mayPlay of the Land Ability

Browse Source
This commit is contained in:
Hanmac
2018-09-30 16:41:22 +02:00
parent 5371cbe9c8
commit 45ee00f10b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1751,6 +1751,9 @@ public class Player extends GameEntity implements Comparable<Player> {
return canPlayLand(land, false); return canPlayLand(land, false);
} }
public final boolean canPlayLand(final Card land, final boolean ignoreZoneAndTiming) { public final boolean canPlayLand(final Card land, final boolean ignoreZoneAndTiming) {
return canPlayLand(land, ignoreZoneAndTiming, null);
}
public final boolean canPlayLand(final Card land, final boolean ignoreZoneAndTiming, SpellAbility landSa) {
if (!ignoreZoneAndTiming && !canCastSorcery()) { if (!ignoreZoneAndTiming && !canCastSorcery()) {
return false; return false;
} }
@@ -1766,7 +1769,7 @@ public class Player extends GameEntity implements Comparable<Player> {
} }
if (land != null && !ignoreZoneAndTiming) { if (land != null && !ignoreZoneAndTiming) {
final boolean mayPlay = !land.mayPlay(this).isEmpty(); final boolean mayPlay = landSa == null ? !land.mayPlay(this).isEmpty() : landSa.getMayPlay() != null;
if (land.getOwner() != this && !mayPlay) { if (land.getOwner() != this && !mayPlay) {
return false; return false;
} }

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

@@ -37,7 +37,7 @@ public class LandAbility extends Ability {
final Card land = this.getHostCard(); final Card land = this.getHostCard();
final Player p = this.getActivatingPlayer(); final Player p = this.getActivatingPlayer();
return p.canPlayLand(land); return p.canPlayLand(land, false, this);
} }
@Override @Override
public void resolve() { public void resolve() {