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

- Made a few more cards multiplayer-ready

Browse Source 
- Improved OpponentTurn restrictions and conditions for multiplayer
This commit is contained in:
moomarc
2013-03-28 13:59:56 +00:00
parent 5eca17a635
commit 9da6f43379
9 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/spellability/SpellAbilityCondition.java
View File

@@ -214,7 +214,7 @@ public class SpellAbilityCondition extends SpellAbilityVariables {
return false;
}
if (this.isOpponentTurn() && Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(activator)) {
if (this.isOpponentTurn() && !Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn().isOpponentOf(activator)) {
return false;
}

2
src/main/java/forge/card/spellability/SpellAbilityRestriction.java
View File

@@ -230,7 +230,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
return false;
}
if (this.isOpponentTurn() && Singletons.getModel().getGame().getPhaseHandler().isPlayerTurn(activator)) {
if (this.isOpponentTurn() && !Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn().isOpponentOf(activator)) {
return false;
}

2
src/main/java/forge/card/trigger/Trigger.java
View File

@@ -237,7 +237,7 @@ public abstract class Trigger extends TriggerReplacementBase {
}
if (this.getMapParams().containsKey("OpponentTurn")) {
if (phaseHandler.isPlayerTurn(this.getHostCard().getController())) {
if (!phaseHandler.getPlayerTurn().isOpponentOf(this.getHostCard().getController())) {
return false;
}
}