Command Post instance cleanup.

L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}
 	

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java

@@ -132,7 +132,9 @@ public class CommandPost extends AbstractInstance
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		if (event.contains("enterInstance"))
+		switch (event)
+		{
+			case "enterInstance":
 			{
 				final Party party = player.getParty();
 				if (player.isInParty())
@@ -187,8 +189,9 @@ public class CommandPost extends AbstractInstance
 				{
 					startQuestTimer("check_status", 3000, null, player);
 				}
+				break;
 			}
-		else if (event.equals("check_status"))
+			case "check_status":
 			{
 				final Instance world = player.getInstanceWorld();
 				if (!isInInstance(world))
@@ -343,10 +346,10 @@ public class CommandPost extends AbstractInstance
 					}
 					case 7:
 					{
-					if (world.getAliveNpcs(GROUP_4).isEmpty())
+						// if (world.getAliveNpcs(GROUP_4).isEmpty())
-					{
+						// {
-						System.out.println("Status is 7.");
+						// System.out.println("Status is 7.");
-					}
+						// }
 						
 						startQuestTimer("check_status", 3000, null, player);
 						break;
@@ -356,6 +359,8 @@ public class CommandPost extends AbstractInstance
 						startQuestTimer("check_status", 3000, null, player);
 					}
 				}
+				break;
+			}
 		}
 		return null;
 	}
@@ -366,27 +371,12 @@ public class CommandPost extends AbstractInstance
 		final Instance world = npc.getInstanceWorld();
 		if (world != null)
 		{
+			npc.setInvul(false);
+			npc.setTargetable(true);
 			if (CommonUtil.contains(GROUP_1, npc.getId()))
 			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
 				world.setStatus(4);
 			}
-			else if (CommonUtil.contains(GROUP_2, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_3, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
-			else if (CommonUtil.contains(GROUP_4, npc.getId()))
-			{
-				npc.setInvul(false);
-				npc.setTargetable(true);
-			}
 		}
 		super.onMoveFinished(npc);
 	}
@@ -395,6 +385,8 @@ public class CommandPost extends AbstractInstance
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
 		final Instance world = creature.getInstanceWorld();
+		if (world != null)
+		{
 			switch (zone.getId())
 			{
 				case 25901:
@@ -423,6 +415,7 @@ public class CommandPost extends AbstractInstance
 					break;
 				}
 			}
+		}
 		return super.onEnterZone(creature, zone);
 	}