Cleanup

L2J_DataPack_BETA/data/scripts/teleports/CrumaTower/CrumaTower.java

@@ -35,7 +35,6 @@ public class CrumaTower extends Quest
 		
 		if (player.getLevel() > 55)
 			htmltext = "30483.htm";
-		
 		else
 			player.teleToLocation(17724,114004,-11672);
 		

L2J_DataPack_BETA/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java

@@ -42,7 +42,6 @@ public class ElrokiTeleporters extends Quest
 				else
 					player.teleToLocation(4990,-1879,-3178);
 				break;
-			
 			case 32112:
 				player.teleToLocation(7557,-5513,-3221);
 				break;

L2J_DataPack_BETA/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java

@@ -65,13 +65,12 @@ public class GrandBossTeleporters extends Quest
 		if (st == null)
 			st = newQuestState(player);
 		
-		if (st.getQuestItemsCount(7267) > 0)
+		if (st.hasQuestItems(7267))
 		{
 			st.takeItems(7267, 1);
 			player.teleToLocation(183813, -115157, -3303);
 			st.set("allowEnter", "1");
 		}
-		
 		else
 			htmltext = "31540-06.htm";
 		
@@ -105,7 +104,7 @@ public class GrandBossTeleporters extends Quest
 					
 					else if (status == 0 || status == 1) //If entrance to see Antharas is unlocked (he is Dormant or Waiting)
 					{
-						if (st.getQuestItemsCount(3865) > 0)
+						if (st.hasQuestItems(3865))
 						{
 							st.takeItems(3865, 1);
 							L2BossZone zone = GrandBossManager.getInstance().getZone(179700, 113800, -7709);

L2J_DataPack_BETA/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java

@@ -46,17 +46,16 @@ public class NewbieTravelToken extends Quest
 		{
 			if (DATA.keySet().contains(new Integer(event)))
 			{
-				if (st.getQuestItemsCount(TOKEN) > 0)
+				if (st.hasQuestItems(TOKEN))
 				{
-		             st.takeItems(TOKEN,1);
-		             st.getPlayer().teleToLocation(DATA.get(event)[0], DATA.get(event)[1], DATA.get(event)[2]);
+					st.takeItems(TOKEN,1);
+					st.getPlayer().teleToLocation(DATA.get(event)[0], DATA.get(event)[1], DATA.get(event)[2]);
 				}
-				
 				else
 				{
-					 st.exitQuest(true);
-		             player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_ITEM_COUNT));
-		             return "";
+					st.exitQuest(true);
+					player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_ITEM_COUNT));
+					return "";
 				}
 			}
 		}
@@ -79,10 +78,9 @@ public class NewbieTravelToken extends Quest
 		
 		if (player.getLevel() >= 20)
 		{
-		     htmltext="cant-travel.htm";
-		     st.exitQuest(true);
+			htmltext="cant-travel.htm";
+			st.exitQuest(true);
 		}
-		
 		else
 			htmltext = String.valueOf(npc.getNpcId())+".htm";
 		

L2J_DataPack_BETA/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java

@@ -37,7 +37,7 @@ public class NoblesseTeleport extends Quest
 		
 		if (event.equalsIgnoreCase("teleportWithToken"))
 		{
-			if (st.getQuestItemsCount(13722) > 0)
+			if (st.hasQuestItems(13722))
 				npc.showChatWindow(player, 3);
 			else
 				return"noble-nopass.htm";

L2J_DataPack_BETA/data/scripts/teleports/OracleTeleport/OracleTeleport.java

@@ -256,7 +256,7 @@ public class OracleTeleport extends Quest
 				htmltext = "1a.htm";
 				st.exitQuest(true);
 			}
-			else if (st.getQuestItemsCount(7079) < 1)
+			else if (!st.hasQuestItems(7079))
 				htmltext = "3.htm";
 			else
 			{
@@ -277,7 +277,7 @@ public class OracleTeleport extends Quest
 				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TOO_MANY_QUESTS));
 				st.exitQuest(true);
 			}
-			else if (st.getQuestItemsCount(7079) < 1)
+			else if (!st.hasQuestItems(7079))
 			{
 				htmltext = "ziggurat_nofrag.htm";
 				st.exitQuest(true);

L2J_DataPack_BETA/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java

@@ -32,8 +32,9 @@ public class PaganTeleporters extends Quest
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		if (event.equalsIgnoreCase("Close_Door1"))
+		{
 			DoorTable.getInstance().getDoor(19160001).closeMe();
-		
+		}
 		else if (event.equalsIgnoreCase("Close_Door2"))
 		{
 			DoorTable.getInstance().getDoor(19160010).closeMe();
@@ -48,7 +49,6 @@ public class PaganTeleporters extends Quest
 	{
 		if (npc.getNpcId() == 32039)
 			player.teleToLocation(-12766, -35840, -10856);
-		
 		else if (npc.getNpcId() == 32040)
 			player.teleToLocation(36640, -51218, 718);
 		
@@ -67,9 +67,8 @@ public class PaganTeleporters extends Quest
 		switch (npc.getNpcId())
 		{
 			case 32034:
-				if (st.getQuestItemsCount(8064) == 0 && st.getQuestItemsCount(8065) == 0 && st.getQuestItemsCount(8067) == 0)
+				if (!st.hasQuestItems(8064) && !st.hasQuestItems(8065) && !st.hasQuestItems(8067))
 					htmltext = "noItem.htm";
-				
 				else
 				{
 					htmltext = "FadedMark.htm";
@@ -77,17 +76,14 @@ public class PaganTeleporters extends Quest
 					startQuestTimer("Close_Door1", 10000, null, null);
 				}
 				break;
-			
 			case 32035:
 				DoorTable.getInstance().getDoor(19160001).openMe();
 				startQuestTimer("Close_Door1", 10000, null, null);
 				htmltext = "FadedMark.htm";
 				break;
-			
 			case 32036:
-				if (st.getQuestItemsCount(8067) == 0)
+				if (!st.hasQuestItems(8067))
 					htmltext = "noMark.htm";
-				
 				else
 				{
 					htmltext = "openDoor.htm";
@@ -96,7 +92,6 @@ public class PaganTeleporters extends Quest
 					DoorTable.getInstance().getDoor(19160011).openMe();
 				}
 				break;
-			
 			case 32037:
 				DoorTable.getInstance().getDoor(19160010).openMe();
 				DoorTable.getInstance().getDoor(19160011).openMe();

L2J_DataPack_BETA/data/scripts/teleports/TeleportWithCharm/TeleportWithCharm.java

@@ -45,11 +45,11 @@ public class TeleportWithCharm extends Quest
 		switch (npc.getNpcId())
 		{
 			case WHIRPY:
-				if (st.getQuestItemsCount(DWARF_GATEKEEPER_TOKEN) >= 1)
+				if (st.hasQuestItems(DWARF_GATEKEEPER_TOKEN))
 				{
 					st.takeItems(DWARF_GATEKEEPER_TOKEN,1);
-				    st.getPlayer().teleToLocation(-80826,149775,-3043);
-				    st.exitQuest(true);
+					st.getPlayer().teleToLocation(-80826,149775,-3043);
+					st.exitQuest(true);
 				}
 				else
 				{
@@ -57,13 +57,12 @@ public class TeleportWithCharm extends Quest
 					htmltext = "30576-01.htm";
 				}
 				break;
-				
 			case TAMIL:
-				if (st.getQuestItemsCount(ORC_GATEKEEPER_CHARM) >= 1)
+				if (st.hasQuestItems(ORC_GATEKEEPER_CHARM))
 				{
 					st.takeItems(ORC_GATEKEEPER_CHARM,1);
 					st.getPlayer().teleToLocation(-80826,149775,-3043);
-				    st.exitQuest(true);
+					st.exitQuest(true);
 				}
 				else
 				{

L2J_DataPack_BETA/data/scripts/teleports/ToIVortex/ToIVortex.java

@@ -50,7 +50,7 @@ public class ToIVortex extends Quest
 		//1st Floor
 		if (event.equalsIgnoreCase("1"))
 		{
-			if (st.getQuestItemsCount(GREEN_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(GREEN_DIMENSION_STONE))
 			{
 				st.takeItems(GREEN_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(114356, 13423, -5096);
@@ -65,7 +65,7 @@ public class ToIVortex extends Quest
 		//2nd Floor
 		else if (event.equalsIgnoreCase("2"))
 		{
-			if (st.getQuestItemsCount(GREEN_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(GREEN_DIMENSION_STONE))
 			{
 				st.takeItems(GREEN_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(114666, 13380, -3608);
@@ -80,7 +80,7 @@ public class ToIVortex extends Quest
 		//3rd Floor
 		else if (event.equalsIgnoreCase("3"))
 		{
-			if (st.getQuestItemsCount(GREEN_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(GREEN_DIMENSION_STONE))
 			{
 				st.takeItems(GREEN_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(111982, 16028, -2120);
@@ -95,7 +95,7 @@ public class ToIVortex extends Quest
 		//4th Floor
 		else if (event.equalsIgnoreCase("4"))
 		{
-			if (st.getQuestItemsCount(BLUE_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(BLUE_DIMENSION_STONE))
 			{
 				st.takeItems(BLUE_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(114636, 13413, -640);
@@ -110,7 +110,7 @@ public class ToIVortex extends Quest
 		//5th Floor
 		else if (event.equalsIgnoreCase("5"))
 		{
-			if (st.getQuestItemsCount(BLUE_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(BLUE_DIMENSION_STONE))
 			{
 				st.takeItems(BLUE_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(114152, 19902, 928);
@@ -125,7 +125,7 @@ public class ToIVortex extends Quest
 		//6th Floor
 		else if (event.equalsIgnoreCase("6"))
 		{
-			if (st.getQuestItemsCount(BLUE_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(BLUE_DIMENSION_STONE))
 			{
 				st.takeItems(BLUE_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(117131, 16044, 1944);
@@ -140,7 +140,7 @@ public class ToIVortex extends Quest
 		//7th Floor
 		else if (event.equalsIgnoreCase("7"))
 		{
-			if (st.getQuestItemsCount(RED_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(RED_DIMENSION_STONE))
 			{
 				st.takeItems(RED_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(113026, 17687, 2952);
@@ -155,7 +155,7 @@ public class ToIVortex extends Quest
 		//8th Floor
 		else if (event.equalsIgnoreCase("8"))
 		{
-			if (st.getQuestItemsCount(RED_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(RED_DIMENSION_STONE))
 			{
 				st.takeItems(RED_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(115571, 13723, 3960);
@@ -170,7 +170,7 @@ public class ToIVortex extends Quest
 		//9th Floor
 		else if (event.equalsIgnoreCase("9"))
 		{
-			if (st.getQuestItemsCount(RED_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(RED_DIMENSION_STONE))
 			{
 				st.takeItems(RED_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(114649, 14144, 4976);
@@ -185,7 +185,7 @@ public class ToIVortex extends Quest
 		//10 Floor
 		else if (event.equalsIgnoreCase("10"))
 		{
-			if (st.getQuestItemsCount(RED_DIMENSION_STONE) > 0)
+			if (st.hasQuestItems(RED_DIMENSION_STONE))
 			{
 				st.takeItems(RED_DIMENSION_STONE, 1);
 				st.getPlayer().teleToLocation(118507, 16605, 5984);
@@ -239,7 +239,6 @@ public class ToIVortex extends Quest
 				htmltext = npcId + "no-adena.htm";
 			}
 		}
-		
 		return htmltext;
 	}