From 537fecb754fe5acf4ca6a76d8035509fb041ef8e Mon Sep 17 00:00:00 2001 From: PikaMug Date: Mon, 3 Jun 2019 16:27:52 -0400 Subject: [PATCH] Stop duplicate quests from /questadmin reload, fixes #811. Bump version --- dist/pom.xml | 2 +- main/pom.xml | 2 +- main/src/main/java/me/blackvein/quests/Quester.java | 9 --------- pom.xml | 4 ++-- v1_8_R1/pom.xml | 2 +- v1_8_R2/pom.xml | 2 +- v1_8_R3/pom.xml | 2 +- 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index bbc26e7b5..dea042a36 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1 quests-dist pom diff --git a/main/pom.xml b/main/pom.xml index 1fd59a184..ec278988e 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -4,7 +4,7 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1 quests-main diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 1d9c03c7f..ac6db603f 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -2323,15 +2323,6 @@ public class Quester { completedQuests.clear(); } if (data.isString("currentQuests") == false) { - List questNames = data.getStringList("currentQuests"); - List questStages = data.getIntegerList("currentStages"); - // These appear to differ sometimes? That seems bad. - int maxSize = Math.min(questNames.size(), questStages.size()); - for (int i = 0; i < maxSize; i++) { - if (plugin.getQuest(questNames.get(i)) != null) { - currentQuests.put(plugin.getQuest(questNames.get(i)), questStages.get(i)); - } - } ConfigurationSection dataSec = data.getConfigurationSection("questData"); if (dataSec == null || dataSec.getKeys(false).isEmpty()) { return false; diff --git a/pom.xml b/pom.xml index 28c9f58b3..47d2da213 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1 quests https://github.com/PikaMug/Quests/ - 3.7.0 + 3.7.1 UTF-8 1.8 1.8 diff --git a/v1_8_R1/pom.xml b/v1_8_R1/pom.xml index cd1a65d71..8c69c8867 100644 --- a/v1_8_R1/pom.xml +++ b/v1_8_R1/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1 diff --git a/v1_8_R2/pom.xml b/v1_8_R2/pom.xml index 019539c71..71deb39d7 100644 --- a/v1_8_R2/pom.xml +++ b/v1_8_R2/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1 diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml index 15fa314fa..68fa604cf 100644 --- a/v1_8_R3/pom.xml +++ b/v1_8_R3/pom.xml @@ -5,7 +5,7 @@ me.blackvein.quests quests-parent - 3.7.0 + 3.7.1