Improved starting Ertheia quests.

trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java

@@ -36,11 +36,9 @@ public class KaraphonHabitat extends AbstractInstance
 	// Npcs
 	private static final int DOLKIN = 33954;
 	private static final int DOLKIN_INSTANCE = 34002;
-	
 	// Locations
 	private static final Location START_LOC = new Location(-82250, 246406, -14152);
 	private static final Location EXIT_LOC = new Location(-88240, 237450, -2880);
-	
 	// Instance
 	private static final int TEMPLATE_ID = 253;
 	
@@ -48,6 +46,14 @@ public class KaraphonHabitat extends AbstractInstance
 	{
 	}
 	
+	public KaraphonHabitat()
+	{
+		super(KaraphonHabitat.class.getSimpleName());
+		addFirstTalkId(DOLKIN_INSTANCE);
+		addStartNpc(DOLKIN, DOLKIN_INSTANCE);
+		addTalkId(DOLKIN, DOLKIN_INSTANCE);
+	}
+	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
@@ -64,6 +70,10 @@ public class KaraphonHabitat extends AbstractInstance
 		else if (event.equals("exit_instance"))
 		{
 			final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+			if (!(world instanceof KHWorld))
+			{
+				return null;
+			}
 			world.removeAllowed(player.getObjectId());
 			teleportPlayer(player, EXIT_LOC, 0);
 		}
@@ -71,11 +81,10 @@ public class KaraphonHabitat extends AbstractInstance
 		return super.onAdvEvent(event, npc, player);
 	}
 	
-	public KaraphonHabitat()
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
-		super(KaraphonHabitat.class.getSimpleName());
-		addStartNpc(DOLKIN);
-		addTalkId(DOLKIN, DOLKIN_INSTANCE);
+		return "34002.html";
 	}
 	
 	@Override

trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java

@@ -116,7 +116,7 @@ public class Q10735_ASpecialPower extends Quest
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		QuestState qs = getQuestState(player, true);
+		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		
 		if (qs.isCompleted())

trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java

@@ -221,8 +221,10 @@ public class Q10736_ASpecialPower extends Quest
 						break;
 					}
 				}
+				break;
 			}
 		}
+		
 		return htmltext;
 	}
 	

trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java

@@ -117,6 +117,7 @@ public class Q10742_AFurryFriend extends Quest
 						player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.REMAINING_TIME));
 						startQuestTimer("unspawn_ricky", 2000, npc, player);
 						cancelQuestTimer("check_ricky_distance", npc, player);
+						cancelQuestTimer("unspawn_ricky_failed", npc, player);
 						break;
 					}