From cc433b6708f51dd1a9bf6f8abc38dcffdc360570 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 23 Nov 2013 04:19:05 +0000 Subject: [PATCH] Fix so PaperCard for card name doesn't change unless card renamed --- .../forge/gui/workshop/controllers/CCardScript.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java b/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java index 7d07baae00e..9975209dad0 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java +++ b/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java @@ -123,13 +123,19 @@ public enum CCardScript implements ICDoc { updateDirtyFlag(); + String oldName = this.currentCard.getName(); + CardRules newRules = CardRules.fromScript(Arrays.asList(text.split("\n"))); CardDb cardDb = newRules.isVariant() ? Singletons.getMagicDb().getVariantCards() : Singletons.getMagicDb().getCommonCards(); newRules = cardDb.getEditor().putCard(newRules); - this.currentCard = cardDb.getCard(newRules.getName()); - Card.updateCard(this.currentCard); + if (newRules.getName().equals(oldName)) { + Card.updateCard(this.currentCard); + } + else { + this.currentCard = cardDb.getCard(newRules.getName()); + } VWorkshopCatalog.SINGLETON_INSTANCE.getCardManager().repaint(); CDetail.SINGLETON_INSTANCE.showCard(this.currentCard);