Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.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/handlers/bypasshandlers/QuestLink.java (modified) (4 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -31 +31 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.StringUtil;
 
@@ -157 +156 @@
                         if (((q.getQuestIntId() >= 1) && (q.getQuestIntId() < 20000)) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder80(true)))
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT));
+                                player.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
                                 return;
                         }
@@ -167 +166 @@
                                         if (player.getAllActiveQuests().length > 40) // if too many ongoing quests, don't show window and send message
                                         {
-                                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TOO_MANY_QUESTS));
+                                                player.sendPacket(SystemMessageId.TOO_MANY_QUESTS);
                                                 return;
                                         }
@@ -238 +237 @@
                 List<Quest> options = new FastList<Quest>();
                 
-                QuestState[] awaits = player.getQuestsForTalk(npc.getTemplate().npcId);
+                QuestState[] awaits = player.getQuestsForTalk(npc.getTemplate().getNpcId());
                 Quest[] starts = npc.getTemplate().getEventQuests(Quest.QuestEventType.QUEST_START);