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

Prevent details mismatching in deck editor

Browse Source
This commit is contained in:
drdev
2014-10-10 16:02:35 +00:00
parent d7d79d11cd
commit ea5e4857af
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -225,7 +225,7 @@ public class CardFactory {
*/ */
public final static Card getCard(final IPaperCard cp, final Player owner) { public final static Card getCard(final IPaperCard cp, final Player owner) {
return getCard(cp, owner, owner == null ? 0 : owner.getGame().nextCardId()); return getCard(cp, owner, owner == null ? -1 : owner.getGame().nextCardId());
} }
public final static Card getCard(final IPaperCard cp, final Player owner, final int cardId) { public final static Card getCard(final IPaperCard cp, final Player owner, final int cardId) {
//System.out.println(cardName); //System.out.println(cardName);
@@ -377,7 +377,7 @@ public class CardFactory {
card.setState(CardCharacteristicName.Original); card.setState(CardCharacteristicName.Original);
} }
if ( st == CardSplitType.Split ) { if (st == CardSplitType.Split) {
card.setName(rules.getName()); card.setName(rules.getName());
// Combined mana cost // Combined mana cost
@@ -400,7 +400,6 @@ public class CardFactory {
//String combinedText = String.format("%s: %s\n%s: %s", rules.getMainPart().getName(), rules.getMainPart().getOracleText(), rules.getOtherPart().getName(), rules.getOtherPart().getOracleText()); //String combinedText = String.format("%s: %s\n%s: %s", rules.getMainPart().getName(), rules.getMainPart().getOracleText(), rules.getOtherPart().getName(), rules.getOtherPart().getOracleText());
//card.setText(combinedText); //card.setText(combinedText);
} }
return card; return card;
} }