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

Bugfix: Pet select cleared before new quest loaded

Browse Source 
Bugfix: Pet select remembers previous pet
This commit is contained in:
Doublestrike
2012-02-01 03:49:43 +00:00
parent 6b45d7564b
commit 94ce5864ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/control/home/ControlQuest.java
View File

@@ -334,7 +334,6 @@ public class ControlQuest {
private void changeQuest() { private void changeQuest() {
AllZone.setQuestData(view.getLstQuests().getSelectedQuest()); AllZone.setQuestData(view.getLstQuests().getSelectedQuest());
this.qData = AllZone.getQuestData(); this.qData = AllZone.getQuestData();
this.qem = new QuestEventManager();
this.qem.assembleAllEvents(); this.qem.assembleAllEvents();
AllZone.setQuestEventManager(this.qem); AllZone.setQuestEventManager(this.qem);
@@ -444,6 +443,7 @@ public class ControlQuest {
final Set<String> petList = this.qData.getPetManager().getAvailablePetNames(); final Set<String> petList = this.qData.getPetManager().getAvailablePetNames();
final QuestPetAbstract currentPet = this.qData.getPetManager().getSelectedPet(); final QuestPetAbstract currentPet = this.qData.getPetManager().getSelectedPet();
view.getCbxPet().removeAllItems();
// Pet list visibility // Pet list visibility
if (petList.size() > 0) { if (petList.size() > 0) {
view.getCbxPet().setEnabled(true); view.getCbxPet().setEnabled(true);
@@ -452,7 +452,7 @@ public class ControlQuest {
view.getCbxPet().addItem("Summon " + pet); view.getCbxPet().addItem("Summon " + pet);
} }
if (currentPet != null) { view.getCbxPet().setSelectedItem(currentPet.getName()); } if (currentPet != null) { view.getCbxPet().setSelectedItem("Summon " + currentPet.getName()); }
} else { } else {
view.getCbxPet().setVisible(false); view.getCbxPet().setVisible(false);
} }