Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java (modified) (2 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/quests/Q636_TruthBeyond/Q636_TruthBeyond.java

@@ -80 +80 @@
                 if (npc.getNpcId() == ELIAH)
                 {
-                        if (st.getQuestItemsCount(VISITOR_MARK) > 0
-                                        || st.getQuestItemsCount(FADED_MARK) > 0
-                                        || st.getQuestItemsCount(MARK) > 0)
+                        if (st.hasQuestItems(VISITOR_MARK) || st.hasQuestItems(FADED_MARK) || st.hasQuestItems(MARK))
                         {
                                 st.exitQuest(true);
@@ -100 +98 @@
                 else if (st.getState() == State.STARTED) // Flauron only
                 {
-                        if (Integer.parseInt(st.get("cond")) == 1)
+                        if (st.getInt("cond") == 1)
+                        {
                                 return "32010-01.htm";
-                        else
-                        {
-                                st.exitQuest(true);
-                                return "32010-03.htm";
                         }
+                        st.exitQuest(true);
+                        return "32010-03.htm";
                 }
                 return getNoQuestMsg(player);