BETA: Core-part for [DP9524]

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -45,7 +45,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.DimensionalRift;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
@@ -70,8 +69,6 @@ public class DimensionalRiftManager
 	{
 		loadRooms();
 		loadSpawns();
-		// UnAfraid: TODO: Move that quest to datapack lol!!!
-		new Quest(635, "RiftQuest", "Dummy Quest shown in players' questlist when inside the rift");
 	}
 	
 	public DimensionalRiftRoom getRoom(byte type, byte room)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -71,7 +71,7 @@ public class DimensionalRift
 		party.setDimensionalRift(this);
 		for (L2PcInstance p : party.getMembers())
 		{
-			Quest riftQuest = QuestManager.getInstance().getQuest(635);
+			final Quest riftQuest = QuestManager.getInstance().getQuest(635);
 			if (riftQuest != null)
 			{
 				QuestState qs = p.getQuestState(riftQuest.getName());
@@ -79,9 +79,9 @@ public class DimensionalRift
 				{
 					qs = riftQuest.newQuestState(p);
 				}
-				if (qs.getCond() != 1)
+				if (!qs.isStarted())
 				{
-					qs.setCond(1);
+					qs.startQuest();
 				}
 			}
 			p.teleToLocation(coords[0], coords[1], coords[2]);
@@ -328,13 +328,13 @@ public class DimensionalRift
 	protected void teleportToWaitingRoom(L2PcInstance player)
 	{
 		DimensionalRiftManager.getInstance().teleportToWaitingRoom(player);
-		Quest riftQuest = QuestManager.getInstance().getQuest(635);
+		final Quest riftQuest = QuestManager.getInstance().getQuest(635);
 		if (riftQuest != null)
 		{
-			QuestState qs = player.getQuestState(riftQuest.getName());
-			if ((qs != null) && (qs.getInt("cond") == 1))
+			final QuestState qs = player.getQuestState(riftQuest.getName());
+			if ((qs != null) && qs.isCond(1))
 			{
-				qs.set("cond", "0");
+				qs.exitQuest(true, true);
 			}
 		}
 	}