瀏覽代碼

BETA: fix Tiad quest
* Html fixed by CostyKiller
* NPE checker and better logger for QuestLiny by UnAfraid
* Fixed bad name for Stage1 super call
* Little clean from [10436]

Zealar 10 年之前
父節點
當前提交
4ccb5e7c38

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/default/32526.htm

@@ -1,6 +1,6 @@
 <html><body>Sergeant Allenos:<br>
 Shhh! Be quiet! There are Dragonkins not far from the <font color="LEVEL">Secret Airstrip</font>!<br>
-<a action="bypass -h npc_%objectId%_Quest SoDStage1">Enter the Seed of Destruction.</a><br>
+<a action="bypass -h npc_%objectId%_Quest Stage1">Enter the Seed of Destruction.</a><br>
 <a action="bypass -h npc_%objectId%_Chat 1">Learn about the Seed of Destruction.</a><br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java

@@ -218,7 +218,7 @@ public final class Stage1 extends Quest
 	public Stage1()
 	{
 		// TODO change name to use actual class name
-		super(-1, "SoDStage1", "gracia/instances");
+		super(-1, "Stage1", "gracia/instances");
 		load();
 		addStartNpc(ALENOS);
 		addTalkId(ALENOS);

+ 10 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -19,6 +19,7 @@
 package handlers.bypasshandlers;
 
 import java.util.List;
+import java.util.logging.Level;
 
 import javolution.util.FastList;
 
@@ -250,13 +251,18 @@ public class QuestLink implements IBypassHandler
 		// By limiting them there, we are allowed to create custom quests at higher IDs without interfering
 		if (awaits != null)
 		{
-			for (QuestState x : awaits)
+			for (QuestState state : awaits)
 			{
-				if (!options.contains(x.getQuest()))
+				if (state.getQuest() == null)
 				{
-					if ((x.getQuest().getId() > 0) && (x.getQuest().getId() < 20000))
+					_log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName());
+					continue;
+				}
+				if (!options.contains(state.getQuest()))
+				{
+					if ((state.getQuest().getId() > 0) && (state.getQuest().getId() < 20000))
 					{
-						options.add(x.getQuest());
+						options.add(state.getQuest());
 					}
 				}
 			}

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml

@@ -687,8 +687,6 @@
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1148" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpInitialConsume" />

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml

@@ -2568,8 +2568,6 @@
 		<set name="icon" val="icon.skill1382" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="itemConsumeCount" val="4" />
-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->
 		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml

@@ -978,8 +978,6 @@
 		<set name="hitTime" val="4000" />
 		<set name="icon" val="icon.skill1148" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="itemConsumeCount" val="1" />
-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="mpInitialConsume" val="#mpConsume_Init" />