diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 3c7fc083c902cd16dcf8e8f61ed4474280204471..53d776adba6ff1881693f69efb358767bf2082ad 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -110,8 +110,8 @@ public class Q10267_JourneyToGracia extends Quest
case "32548-02.htm":
st.giveAdena(92500, false);
st.addExpAndSp(75480, 7570);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 9ced5bdf96a58ded4cbe04f970514953255de64e..e679445f5e8ce22a2a1397004a08569f2c9a65f1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -68,8 +68,8 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
htmltext = "32530-01.htm";
st.giveAdena(16671, false);
st.addExpAndSp(100640, 10098);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 9e0b2a1862677f46600a5576546fd84ba0da4e4a..ad2fefa25608cf14a52c4a180d57f64616f5af93 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -68,8 +68,8 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
htmltext = "32526-01.htm";
st.giveAdena(29174, false);
st.addExpAndSp(176121, 7671);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 5ca301e1b6138deb000d171397fde903af9b3105..69de2c9701ae15b053520ce5c15783b5ffa703a1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -108,8 +108,8 @@ public class Q10281_MutatedKaneusRune extends Quest
break;
case "31335-03.htm":
st.rewardItems(57, 360000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
index fbb692187302a2dbd66a49d6fb7094cdf0aca165..b966a979edfbc2c4db59908f24a38d3d6c621523 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q11_SecretMeetingWithKetraOrcs/Q11_SecretMeetingWithKetraOrcs.java
@@ -68,8 +68,8 @@ public class Q11_SecretMeetingWithKetraOrcs extends Quest
{
st.takeItems(BOX, -1);
st.addExpAndSp(233125, 18142);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
index 5f7f7ba7265d64a47eac172afaefe4b730fea0d0..eff8e6e35f55e7fc484e9b7dec9fcaaac83e1de2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q13_ParcelDelivery/Q13_ParcelDelivery.java
@@ -60,8 +60,8 @@ public class Q13_ParcelDelivery extends Quest
st.takeItems(PACKAGE, -1);
st.giveItems(57, 157834);
st.addExpAndSp(589092, 58794);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
index a4d7e9e1cbea7fc4b8102a2267571b8539b1a4e9..9d4e281aa2fd00a51d61023784cb3a73994053a7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
@@ -103,7 +103,6 @@ public class Q251_NoSecrets extends Quest
st.addExpAndSp(56787, 160578);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
- st.setState(State.COMPLETED);
}
}
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
index b2c56281300500f32de99fa5170dc291920caec2..39f13df33f2a55cec1c94d8c283e08cdd9baa158 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q290_ThreatRemoval/Q290_ThreatRemoval.java
@@ -97,9 +97,8 @@ public class Q290_ThreatRemoval extends Quest
}
else if (event.equalsIgnoreCase("30201-08.htm"))
{
- st.unset("cond");
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
index 5fc74105732e273b3b19fb35b4921e486fea393d..76425b3dfed1dd22e603f9b1fc3ab5a3dbbae67c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q307_ControlDeviceOfTheGiants/Q307_ControlDeviceOfTheGiants.java
@@ -143,8 +143,8 @@ public class Q307_ControlDeviceOfTheGiants extends Quest
else if (st.getInt("cond") == 2)
{
st.giveItems(SUPPORT_ITEMS, 1);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
htmltext = "32711-10.htm";
}
break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
index 35cad054e423599858871e5f61e55b2874b79f68..1b18d33e1dbc38fd3c613ed2db06a4d4ebd5975e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q309_ForAGoodCause/Q309_ForAGoodCause.java
@@ -195,8 +195,8 @@ public class Q309_ForAGoodCause extends Quest
}
else if (event.equalsIgnoreCase("32647-14.htm") || event.equalsIgnoreCase("32647-07.htm"))
{
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
return htmltext;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
index 7d1e21c34e4e3d9dbf861056137d317e872253d3..e877a18b9ee4f874f8c05287232d03225a230259 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q401_PathToWarrior/Q401_PathToWarrior.java
@@ -166,8 +166,8 @@ public class Q401_PathToWarrior extends Quest
st.giveItems(57, 163800);
st.playSound("ItemSound.quest_finish");
player.sendPacket(new SocialAction(player.getObjectId(), 3));
- st.exitQuest(false);
st.saveGlobalQuestVar("1ClassQuestFinished", "1");
+ st.exitQuest(false);
htmltext = "30010-13.html";
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
index ac143ab151d0f7a586ed1452ca3066298f8aed43..ddda6e94831e726cffcce52adba3c7dde016145b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q452_FindingtheLostSoldiers/Q452_FindingtheLostSoldiers.java
@@ -104,7 +104,6 @@ public class Q452_FindingtheLostSoldiers extends Quest
st.giveItems(57, 95200);
st.addExpAndSp(435024, 50366);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
Calendar reDo = Calendar.getInstance();
reDo.set(Calendar.MINUTE, RESET_MIN);
@@ -112,6 +111,7 @@ public class Q452_FindingtheLostSoldiers extends Quest
reDo.add(Calendar.DATE, 1);
reDo.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
st.set("reDoTime", String.valueOf(reDo.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED :
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
index 86b2560f5e4796016dec48cdb7af2df9c6c77e43..f3daf599a317198f9bb4b26ffd7661d30eafe471 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q453_NotStrongEnoughAlone/Q453_NotStrongEnoughAlone.java
@@ -126,7 +126,6 @@ public class Q453_NotStrongEnoughAlone extends Quest
st.giveItems(Reward[0][Rnd.get(Reward[0].length)], 1);
else
st.giveItems(Reward[1][Rnd.get(Reward[1].length)], 1);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
htmltext = "32734-14.html";
@@ -136,6 +135,7 @@ public class Q453_NotStrongEnoughAlone extends Quest
reset.add(Calendar.DATE, 1);
reset.set(Calendar.HOUR_OF_DAY, ResetHour);
st.set("reset", String.valueOf(reset.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
index a2dccc37b4ae81dc1e698fe3e7a67a644210cd42..ef4fa2d4cd2664054baa7038c8748ddd703329fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
@@ -89,8 +89,6 @@ public class Q461_RumbleInTheBase extends Quest
st.addExpAndSp(224784, 342528);
st.playSound("ItemSound.quest_finish");
htmltext = "30200-07.html";
- st.unset("cond");
- st.exitQuest(false);
Calendar time = Calendar.getInstance();
time.set(Calendar.MINUTE, ResetMin);
@@ -98,6 +96,7 @@ public class Q461_RumbleInTheBase extends Quest
time.add(Calendar.DATE, 1);
time.set(Calendar.HOUR_OF_DAY, ResetHour);
st.set("time", String.valueOf(time.getTimeInMillis()));
+ st.exitQuest(false);
}
break;
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
index 59fcda7f050598669e2fef71f68310ce33949e5f..0df54806dcc21a4263d228b0ec01aac4777e36d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q637_ThroughOnceMore/Q637_ThroughOnceMore.java
@@ -106,8 +106,8 @@ public final class Q637_ThroughOnceMore extends Quest
st.takeItems(FADED_MARK, 1);
st.giveItems(MARK, 1);
st.giveItems(8273,10);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
return "32010-05.htm";
}
return "32010-04.htm";
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
index 053e30567cdd742170b1e677670eb4f176c4fb1a..3f150b34b4c6a89751e8d8a519f5477e8ec09029 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q690_JudesRequest/Q690_JudesRequest.java
@@ -80,8 +80,8 @@ public class Q690_JudesRequest extends Quest
else if (event.equalsIgnoreCase("32356-08.htm"))
{
st.takeItems(EVIL_WEAPON, -1);
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
else if (event.equalsIgnoreCase("32356-09.htm"))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
index 43fdcd7e7fd25c86538bead0f319c5949ec3a993..48c242e4e05c5cd9407900197c4cc6451aea265d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q702_ATrapForRevenge/Q702_ATrapForRevenge.java
@@ -106,8 +106,8 @@ public class Q702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32555-05.html"))
{
- st.exitQuest(true);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(true);
}
else if (event.equalsIgnoreCase("32555-06.html"))
{