Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-06-30 08:34:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from BlockCat/master

Browse Source 
*Fix reach location not saving
This commit is contained in:
BlockCat 2013-08-06 01:20:02 -07:00
commit 9d07f954f1
3 changed files with 4898 additions and 4889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/blackvein/quests/Quest.java
View File

@ -64,7 +64,7 @@ public class Quest {
Player player = q.getPlayer();
if(stages.indexOf(q.currentStage) == (stages.size() - 1)){
if(q.currentStageIndex >= (stages.size() - 1)){
if(q.currentStage.script != null)
plugin.trigger.parseQuestTaskTrigger(q.currentStage.script, player);
@ -81,6 +81,7 @@ public class Quest {
if(q.currentStage.event != null)
q.currentStage.event.happen(q);
q.currentStage = stages.get(stages.indexOf(q.currentStage) + 1);
q.currentStageIndex++;
q.addEmpties();
player.sendMessage(ChatColor.GOLD + "---(Objectives)---");
@ -251,6 +252,7 @@ public class Quest {
}
q.currentQuest = null;
q.currentStage = null;
q.currentStageIndex = 0;
q.saveData();
player.updateInventory();

6
src/main/java/me/blackvein/quests/QuestFactory.java
View File

@ -1176,6 +1176,12 @@ public class QuestFactory implements ConversationAbandonedListener, ColorUtil {
}
}
if (cc.getSessionData(pref + CK.S_REACH_LOCATIONS) != null) {
reachLocs = (LinkedList<String>) cc.getSessionData(pref + CK.S_REACH_LOCATIONS);
reachRadii = (LinkedList<Integer>) cc.getSessionData(pref + CK.S_REACH_LOCATIONS_RADIUS);
reachNames = (LinkedList<String>) cc.getSessionData(pref + CK.S_REACH_LOCATIONS_NAMES);
}
if (cc.getSessionData(pref + CK.S_TAME_TYPES) != null) {
tames = (LinkedList<String>) cc.getSessionData(pref + CK.S_TAME_TYPES);
tameAmounts = (LinkedList<Integer>) cc.getSessionData(pref + CK.S_TAME_AMOUNTS);

3
src/main/java/me/blackvein/quests/Quester.java
View File

@ -30,6 +30,7 @@ public class Quester {
public Quest currentQuest;
public String questToTake;
Stage currentStage;
public int currentStageIndex = 0;
int questPoints = 0;
Quests plugin;
public LinkedList<String> completedQuests = new LinkedList<String>();
@ -1673,7 +1674,7 @@ public class Quester {
if (currentQuest != null) {
data.set("currentQuest", currentQuest.name);
data.set("currentStage", currentQuest.stages.indexOf(currentStage));
data.set("currentStage", currentStageIndex);
data.set("quest-points", questPoints);
if (blocksDamaged.isEmpty() == false) {