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

Merge branch 'unmappable-characters' into 'master'

Browse Source 
Replace unmappable characters.

See merge request core-developers/forge!1416
This commit is contained in:
Sol
2019-02-23 21:04:11 +00:00
parent 3cf8b956e4 4ddf811118
commit f5f164af93
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -1874,7 +1874,7 @@ public class GameAction {
// Assumes that the list of players is in APNAP order, which should be the case // Assumes that the list of players is in APNAP order, which should be the case
// Optional here as well to handle the way that mulligans do the choice // Optional here as well to handle the way that mulligans do the choice
// 701.17. Scry // 701.17. Scry
// 701.17a To “scry N” means to look at the top N cards of your library, then put any number of them // 701.17a To "scry N" means to look at the top N cards of your library, then put any number of them
// on the bottom of your library in any order and the rest on top of your library in any order. // on the bottom of your library in any order and the rest on top of your library in any order.
// 701.17b If a player is instructed to scry 0, no scry event occurs. Abilities that trigger whenever a // 701.17b If a player is instructed to scry 0, no scry event occurs. Abilities that trigger whenever a
// player scries won’t trigger. // player scries won’t trigger.

4
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -735,7 +735,7 @@ public class TriggerHandler {
} }
} }
} else if (kw.startsWith("Dieharmonicon")) { } else if (kw.startsWith("Dieharmonicon")) {
// 700.4. The term dies means “is put into a graveyard from the battlefield.” // 700.4. The term dies means "is put into a graveyard from the battlefield."
if (runParams.get("Origin") instanceof String) { if (runParams.get("Origin") instanceof String) {
final String origin = (String) runParams.get("Origin"); final String origin = (String) runParams.get("Origin");
if ("Battlefield".equals(origin) && runParams.get("Destination") instanceof String) { if ("Battlefield".equals(origin) && runParams.get("Destination") instanceof String) {
@@ -765,7 +765,7 @@ public class TriggerHandler {
n++; n++;
} }
} else if (kw.startsWith("Dieharmonicon")) { } else if (kw.startsWith("Dieharmonicon")) {
// 700.4. The term dies means “is put into a graveyard from the battlefield.” // 700.4. The term dies means "is put into a graveyard from the battlefield."
final String valid = kw.split(":")[1]; final String valid = kw.split(":")[1];
if (!table.filterCards(ImmutableList.of(ZoneType.Battlefield), ZoneType.Graveyard, if (!table.filterCards(ImmutableList.of(ZoneType.Battlefield), ZoneType.Graveyard,
valid, ck, null).isEmpty()) { valid, ck, null).isEmpty()) {