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

Merge branch 'sentry-bug-fixes' into 'master'

Browse Source 
Sentry Bug Fixes

Closes #705

See merge request core-developers/forge!914
This commit is contained in:
Michael Kamensky
2018-09-12 19:36:05 +00:00
parent 27d2ba384d 5c723d8883
commit 71397ec648
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3763,8 +3763,12 @@ public class CardFactoryUtil {
final SpellAbility origSA = card.getFirstSpellAbility(); final SpellAbility origSA = card.getFirstSpellAbility();
// append to original SA // append to original SA
origSA.appendSubAbility(newSA); origSA.appendSubAbility(newSA);
} else if (keyword.startsWith("Equip")) { } else if (keyword.startsWith("Equip")) {
if (!keyword.contains(":")) {
System.err.println("Malformed Equip entry! - Card: " + card.toString());
return;
}
String[] k = keyword.split(":"); String[] k = keyword.split(":");
// Get cost string // Get cost string
String equipCost = k[1]; String equipCost = k[1];

2
forge-gui/src/main/java/forge/deck/DeckImportController.java
View File

@@ -72,7 +72,7 @@ public class DeckImportController {
} }
final Deck result = new Deck(); final Deck result = new Deck();
DeckSection deckSection = null; DeckSection deckSection = DeckSection.Main;
String section = ""; String section = "";
for (final DeckRecognizer.Token t : tokens) { for (final DeckRecognizer.Token t : tokens) {
final DeckRecognizer.TokenType type = t.getType(); final DeckRecognizer.TokenType type = t.getType();