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

Protected Trade/Quest system + Expirable quests

Browse Source 
Added true protection against race conditions on player trades and fixed
some situational issues. Character's quest status table also received
concurrency treatment. Quests with time limit now expires properly.
Increased subtly the performance on the server start-up.
This commit is contained in:
ronancpl
2017-05-26 23:09:42 -03:00
parent 702c69897b
commit d0396e4c36
15 changed files with 229 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/quest/MapleQuest.java
View File

@@ -46,7 +46,7 @@ public class MapleQuest {
private static Map<Integer, MapleQuest> quests = new HashMap<>();
protected short infoNumber, id;
protected int timeLimit, timeLimit2;
protected int timeLimit;
protected String infoex;
protected Map<MapleQuestRequirementType, MapleQuestRequirement> startReqs = new EnumMap<>(MapleQuestRequirementType.class);
protected Map<MapleQuestRequirementType, MapleQuestRequirement> completeReqs = new EnumMap<>(MapleQuestRequirementType.class);
@@ -57,20 +57,22 @@ public class MapleQuest {
private boolean autoPreComplete, autoComplete;
private boolean repeatable = false;
private final static MapleDataProvider questData = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Quest.wz"));
private static MapleData questInfo;
private static MapleData questAct;
private static MapleData questReq;
private static MapleData questInfo;
private static MapleData questAct;
private static MapleData questReq;
private MapleQuest(int id) {
this.id = (short) id;
if(questInfo != null) {
timeLimit = MapleDataTool.getInt("timeLimit", questInfo, 0);
timeLimit2 = MapleDataTool.getInt("timeLimit2", questInfo, 0);
autoStart = MapleDataTool.getInt("autoStart", questInfo, 0) == 1;
autoPreComplete = MapleDataTool.getInt("autoPreComplete", questInfo, 0) == 1;
autoComplete = MapleDataTool.getInt("autoComplete", questInfo, 0) == 1;
}
if(questInfo != null) {
MapleData reqData = questInfo.getChildByPath(String.valueOf(id));
timeLimit = MapleDataTool.getInt("timeLimit", reqData, 0);
timeLimit = Math.max(timeLimit, MapleDataTool.getInt("timeLimit2", reqData, 0)); // alas, nexon made we deal with 2 timeLimits
autoStart = MapleDataTool.getInt("autoStart", reqData, 0) == 1;
autoPreComplete = MapleDataTool.getInt("autoPreComplete", reqData, 0) == 1;
autoComplete = MapleDataTool.getInt("autoComplete", reqData, 0) == 1;
}
MapleData reqData = questReq.getChildByPath(String.valueOf(id));
if (reqData == null) {//most likely infoEx
@@ -84,7 +86,7 @@ public class MapleQuest {
repeatable = true;
}
if (type.equals(MapleQuestRequirementType.INFO_NUMBER)) {
if (type.equals(MapleQuestRequirementType.INFO_NUMBER)) {
infoNumber = (short) MapleDataTool.getInt(startReq, 0);
}
@@ -280,11 +282,9 @@ public class MapleQuest {
newStatus.setForfeited(c.getQuest(this).getForfeited());
if (timeLimit > 0) {
c.questTimeLimit(this, 30000);//timeLimit * 1000
}
if (timeLimit2 > 0) {//=\
c.questTimeLimit(this, timeLimit);
}
c.updateQuest(newStatus);
return true;
}