Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load quests async on startup

Browse Source
This commit is contained in:
P0nk
2021-04-12 22:05:57 +02:00
parent a59b55db57
commit 055ee01ae9
2 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/server/Server.java
View File

@@ -856,15 +856,11 @@ public class Server {
final List<Future<?>> futures = new ArrayList<>();
futures.add(initExecutor.submit(() -> SkillFactory.loadAllSkills()));
futures.add(initExecutor.submit(() -> CashItemFactory.loadAllCashItems()));
futures.add(initExecutor.submit(() -> MapleQuest.loadAllQuests()));
ThreadManager.getInstance().start();
initializeTimelyTasks(); // aggregated method for timely tasks thanks to lxconan
long timeToTake = System.currentTimeMillis();
MapleQuest.loadAllQuest();
final double questLoadTime = (System.currentTimeMillis() - timeToTake) / 1000.0;
log.info("Quest loaded in {} seconds", questLoadTime);
NewYearCardRecord.startPendingNewYearCardRequests();
if (YamlConfig.config.server.USE_THREAD_TRACKER) {
@@ -888,7 +884,7 @@ public class Server {
}
if (YamlConfig.config.server.USE_FAMILY_SYSTEM) {
timeToTake = System.currentTimeMillis();
long timeToTake = System.currentTimeMillis();
MapleFamily.loadAllFamilies();
final double familyLoadTime = (System.currentTimeMillis() - timeToTake) / 1000.0;
log.info("Families loaded in {} seconds", familyLoadTime);

74
src/main/java/server/quest/MapleQuest.java
View File

@@ -21,20 +21,10 @@
*/
package server.quest;
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import client.MapleCharacter;
import client.MapleQuestStatus;
import client.MapleQuestStatus.Status;
import config.YamlConfig;
import java.util.Collection;
import java.util.EnumMap;
import java.util.Map.Entry;
import java.util.Set;
import provider.MapleData;
import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
@@ -44,6 +34,10 @@ import server.quest.requirements.*;
import tools.MaplePacketCreator;
import tools.StringUtil;
import java.io.File;
import java.util.*;
import java.util.Map.Entry;
/**
*
* @author Matze
@@ -51,8 +45,8 @@ import tools.StringUtil;
*/
public class MapleQuest {
private static Map<Integer, MapleQuest> quests = new HashMap<>();
private static Map<Integer, Integer> infoNumberQuests = new HashMap<>();
private static volatile Map<Integer, MapleQuest> quests = new HashMap<>();
private static volatile Map<Integer, Integer> infoNumberQuests = new HashMap<>();
private static Map<Short, Integer> medals = new HashMap<>();
private static final Set<Short> exploitableQuests = new HashSet<>();
@@ -459,9 +453,7 @@ public class MapleQuest {
}
public static void clearCache(int quest) {
if(quests.containsKey(quest)){
quests.remove(quest);
}
quests.remove(quest);
}
public static void clearCache() {
@@ -656,29 +648,31 @@ public class MapleQuest {
return ret;
}
public static void loadAllQuest() {
try {
for(MapleData quest : questInfo.getChildren()) {
int questID = Integer.parseInt(quest.getName());
MapleQuest q = new MapleQuest(questID);
quests.put(questID, q);
int infoNumber;
infoNumber = q.getInfoNumber(Status.STARTED);
if (infoNumber > 0) {
infoNumberQuests.put(infoNumber, questID);
}
infoNumber = q.getInfoNumber(Status.COMPLETED);
if (infoNumber > 0) {
infoNumberQuests.put(infoNumber, questID);
}
}
} catch (Exception ex) {
ex.printStackTrace();
}
}
public static void loadAllQuests() {
final Map<Integer, MapleQuest> loadedQuests = new HashMap<>();
final Map<Integer, Integer> loadedInfoNumberQuests = new HashMap<>();
for (MapleData quest : questInfo.getChildren()) {
int questID = Integer.parseInt(quest.getName());
MapleQuest q = new MapleQuest(questID);
loadedQuests.put(questID, q);
int infoNumber;
infoNumber = q.getInfoNumber(Status.STARTED);
if (infoNumber > 0) {
loadedInfoNumberQuests.put(infoNumber, questID);
}
infoNumber = q.getInfoNumber(Status.COMPLETED);
if (infoNumber > 0) {
loadedInfoNumberQuests.put(infoNumber, questID);
}
}
MapleQuest.quests = loadedQuests;
MapleQuest.infoNumberQuests = loadedInfoNumberQuests;
}
}