From 12f6f62a2496a065cb17e1af42430e004bc99ffd Mon Sep 17 00:00:00 2001
From: Hitonoriol <gorgilike@mail.ru>
Date: Mon, 15 Aug 2022 05:34:51 +0300
Subject: [PATCH] Fix quest loading

(Quests were Enumerable but had their ids uninitialized after deserializing from json, making them all have the same id)
---
 build.gradle                                  |  2 +-
 .../madsand/properties/QuestList.java         | 25 ++++++++++---------
 .../madsand/resources/Resources.java          |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index e6a4bc5a..f65f09f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.Show
 allprojects {
 	apply plugin: "eclipse"
 
-	version = 'v0.49.18.1a'
+	version = 'v0.49.19a'
 	
 	ext {
 		appName = "MadSand"
diff --git a/core/src/hitonoriol/madsand/properties/QuestList.java b/core/src/hitonoriol/madsand/properties/QuestList.java
index f18b4849..d09b58c6 100644
--- a/core/src/hitonoriol/madsand/properties/QuestList.java
+++ b/core/src/hitonoriol/madsand/properties/QuestList.java
@@ -1,12 +1,13 @@
-package hitonoriol.madsand.properties;
-
-import java.util.HashMap;
-
-import hitonoriol.madsand.entities.quest.Quest;
-
-public class QuestList {
-	public static final int NO_QUESTS_STATUS = -1;
-	public static final int QUEST_IN_PROGRESS_STATUS = -2;
-	
-	public static HashMap<Integer, Quest> quests =  new HashMap<Integer, Quest>();
-}
+package hitonoriol.madsand.properties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import hitonoriol.madsand.entities.quest.Quest;
+
+public class QuestList {
+	public static final int NO_QUESTS_STATUS = -1;
+	public static final int QUEST_IN_PROGRESS_STATUS = -2;
+	
+	public static Map<Integer, Quest> quests =  new HashMap<Integer, Quest>();
+}
diff --git a/core/src/hitonoriol/madsand/resources/Resources.java b/core/src/hitonoriol/madsand/resources/Resources.java
index ef63cd42..3268c365 100644
--- a/core/src/hitonoriol/madsand/resources/Resources.java
+++ b/core/src/hitonoriol/madsand/resources/Resources.java
@@ -160,7 +160,7 @@ private static void loadTutorial() {
 	}
 
 	private static void loadQuests() {
-		QuestList.quests = loadMap(QUEST_FILE, Integer.class, Quest.class);
+		QuestList.quests = loadEnumerableMap(QUEST_FILE, Quest.class);
 		Utils.out(QuestList.quests.size() + " quests");
 	}