diff --git a/src/main/java/me/blackvein/quests/QuestData.java b/src/main/java/me/blackvein/quests/QuestData.java index 145d014e2..083e373a0 100644 --- a/src/main/java/me/blackvein/quests/QuestData.java +++ b/src/main/java/me/blackvein/quests/QuestData.java @@ -13,8 +13,7 @@ package me.blackvein.quests; import java.util.Collection; -import java.util.EnumMap; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.Map; @@ -81,6 +80,7 @@ public class QuestData { return i; } }; + public LinkedList blocksBroken = new LinkedList() { private static final long serialVersionUID = -6071822509475270168L; @@ -124,6 +124,7 @@ public class QuestData { return i; } }; + public LinkedList blocksPlaced = new LinkedList() { private static final long serialVersionUID = 4226366446050903433L; @@ -167,6 +168,7 @@ public class QuestData { return i; } }; + public LinkedList blocksUsed = new LinkedList() { private static final long serialVersionUID = -9057864863810306890L; @@ -210,6 +212,7 @@ public class QuestData { return i; } }; + public LinkedList blocksCut = new LinkedList() { private static final long serialVersionUID = -8204359763290995080L; @@ -253,7 +256,8 @@ public class QuestData { return i; } }; - public Map potionsBrewed = new HashMap() { + + public LinkedHashMap potionsBrewed = new LinkedHashMap() { private static final long serialVersionUID = 5079308756224324031L; @@ -287,7 +291,8 @@ public class QuestData { quester.updateJournal(); } }; - public Map itemsDelivered = new HashMap() { + + public LinkedHashMap itemsDelivered = new LinkedHashMap() { private static final long serialVersionUID = 2712497347022734646L; @@ -321,7 +326,8 @@ public class QuestData { quester.updateJournal(); } }; - public Map, Integer> itemsEnchanted = new HashMap, Integer>() { + + public LinkedHashMap, Integer> itemsEnchanted = new LinkedHashMap, Integer>() { private static final long serialVersionUID = 416869352279205852L; @@ -355,6 +361,7 @@ public class QuestData { quester.updateJournal(); } }; + public LinkedList mobsKilled = new LinkedList() { private static final long serialVersionUID = 8178007458817522183L; @@ -421,6 +428,7 @@ public class QuestData { return s; } }; + public LinkedList mobNumKilled = new LinkedList() { private static final long serialVersionUID = 2228385647091499176L; @@ -487,6 +495,7 @@ public class QuestData { return s; } }; + public LinkedList locationsToKillWithin = new LinkedList() { private static final long serialVersionUID = 557285564460615021L; @@ -553,6 +562,7 @@ public class QuestData { return s; } }; + public LinkedList radiiToKillWithin = new LinkedList() { private static final long serialVersionUID = 1973115869697752181L; @@ -619,7 +629,8 @@ public class QuestData { return s; } }; - public Map citizensInteracted = new HashMap() { + + public LinkedHashMap citizensInteracted = new LinkedHashMap() { private static final long serialVersionUID = 2447610341508300847L; @@ -653,6 +664,7 @@ public class QuestData { quester.updateJournal(); } }; + public LinkedList citizensKilled = new LinkedList() { private static final long serialVersionUID = -6054581494356961482L; @@ -719,6 +731,7 @@ public class QuestData { return s; } }; + public LinkedList citizenNumKilled = new LinkedList() { private static final long serialVersionUID = 1849192351499071688L; @@ -785,6 +798,7 @@ public class QuestData { return s; } }; + public LinkedList locationsReached = new LinkedList() { private static final long serialVersionUID = 2875034788869133862L; @@ -851,6 +865,7 @@ public class QuestData { return s; } }; + public LinkedList hasReached = new LinkedList() { private static final long serialVersionUID = -8802305642082466541L; @@ -917,6 +932,7 @@ public class QuestData { return s; } }; + public LinkedList radiiToReachWithin = new LinkedList() { private static final long serialVersionUID = 6027656509740406846L; @@ -983,7 +999,9 @@ public class QuestData { return s; } }; - public Map mobsTamed = new EnumMap(EntityType.class) { + + //public Map mobsTamed = new EnumMap(EntityType.class) { + public LinkedHashMap mobsTamed = new LinkedHashMap() { private static final long serialVersionUID = 3851959471748032699L; @@ -1017,7 +1035,9 @@ public class QuestData { quester.updateJournal(); } }; - public Map sheepSheared = new EnumMap(DyeColor.class) { + + //public Map sheepSheared = new EnumMap(DyeColor.class) { + public LinkedHashMap sheepSheared = new LinkedHashMap() { private static final long serialVersionUID = -6016463677133534885L; @@ -1051,7 +1071,8 @@ public class QuestData { quester.updateJournal(); } }; - public Map passwordsSaid = new HashMap() { + + public LinkedHashMap passwordsSaid = new LinkedHashMap() { private static final long serialVersionUID = -4297290041298491402L; @@ -1085,7 +1106,8 @@ public class QuestData { quester.updateJournal(); } }; - public Map customObjectiveCounts = new HashMap() { + + public LinkedHashMap customObjectiveCounts = new LinkedHashMap() { private static final long serialVersionUID = -2148775183072606256L; @@ -1119,7 +1141,8 @@ public class QuestData { quester.updateJournal(); } }; - public Map eventFired = new HashMap() { + + public LinkedHashMap eventFired = new LinkedHashMap() { private static final long serialVersionUID = 7106048037834965123L; @@ -1153,6 +1176,7 @@ public class QuestData { quester.updateJournal(); } }; + private int fishCaught = 0; private int playersKilled = 0; public long delayStartTime = 0; @@ -1178,4 +1202,4 @@ public class QuestData { public int getPlayersKilled() { return playersKilled; } -} +} \ No newline at end of file