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

- [C17] updated Curses to work correctly for "you and the triggered attacking player".

Browse Source
This commit is contained in:
Agetian
2017-08-13 15:13:32 +00:00
parent 39b1c1f7e4
commit e398d6af75
6 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -971,10 +971,14 @@ public class AbilityUtils {
}
}
else if (defined.startsWith("Triggered")) {
String defParsed = defined.endsWith("AndYou") ? defined.substring(0, defined.indexOf("AndYou")) : defined;
if (defined.endsWith("AndYou")) {
players.add(sa.getHostCard().getController());
}
final SpellAbility root = sa.getRootAbility();
Object o = null;
if (defined.endsWith("Controller")) {
String triggeringType = defined.substring(9);
if (defParsed.endsWith("Controller")) {
String triggeringType = defParsed.substring(9);
triggeringType = triggeringType.substring(0, triggeringType.length() - 10);
final Object c = root.getTriggeringObject(triggeringType);
if (c instanceof Card) {
@@ -984,8 +988,8 @@ public class AbilityUtils {
o = ((SpellAbility) c).getActivatingPlayer();
}
}
else if (defined.endsWith("Opponent")) {
String triggeringType = defined.substring(9);
else if (defParsed.endsWith("Opponent")) {
String triggeringType = defParsed.substring(9);
triggeringType = triggeringType.substring(0, triggeringType.length() - 8);
final Object c = root.getTriggeringObject(triggeringType);
if (c instanceof Card) {
@@ -995,8 +999,8 @@ public class AbilityUtils {
o = ((SpellAbility) c).getActivatingPlayer().getOpponents();
}
}
else if (defined.endsWith("Owner")) {
String triggeringType = defined.substring(9);
else if (defParsed.endsWith("Owner")) {
String triggeringType = defParsed.substring(9);
triggeringType = triggeringType.substring(0, triggeringType.length() - 5);
final Object c = root.getTriggeringObject(triggeringType);
if (c instanceof Card) {
@@ -1004,7 +1008,7 @@ public class AbilityUtils {
}
}
else {
final String triggeringType = defined.substring(9);
final String triggeringType = defParsed.substring(9);
o = root.getTriggeringObject(triggeringType);
}
if (o != null) {