Minor cleanup on scripts

Reported by: @jurchiks

L2J_DataPack/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java

@@ -39,7 +39,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
-import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -586,7 +585,7 @@ public final class HallOfSuffering extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
 		if (tmpworld instanceof HSWorld)
@@ -595,7 +594,7 @@ public final class HallOfSuffering extends AbstractNpcAI
 			
 			if (npc.getId() == TUMOR_ALIVE)
 			{
-				addSpawn(TUMOR_DEAD, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0, false, npc.getInstanceId());
+				addSpawn(TUMOR_DEAD, npc, false, 0, false, npc.getInstanceId());
 			}
 			if (world.getStatus() < 5)
 			{
@@ -627,7 +626,7 @@ public final class HallOfSuffering extends AbstractNpcAI
 				}
 			}
 		}
-		return "";
+		return super.onKill(npc, killer, isSummon);
 	}
 	
 	@Override
@@ -652,46 +651,45 @@ public final class HallOfSuffering extends AbstractNpcAI
 			
 			return getPtLeaderText(player, (HSWorld) world);
 		}
-		return "";
+		return super.onFirstTalk(npc, player);
 	}
 	
 	@Override
-	public String onTalk(L2Npc npc, L2PcInstance player)
+	public String onTalk(L2Npc npc, L2PcInstance talker)
 	{
-		getQuestState(player, true);
+		getQuestState(talker, true);
 		if (npc.getId() == MOUTHOFEKIMUS)
 		{
-			enterInstance(player, "HallOfSuffering.xml", ENTER_TELEPORT);
+			enterInstance(talker, "HallOfSuffering.xml", ENTER_TELEPORT);
 		}
 		else if (npc.getId() == TEPIOS)
 		{
-			InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+			InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker);
 			if (((HSWorld) world).rewardItemId == -1)
 			{
-				_log.warning("Hall of Suffering: " + player.getName() + "(" + player.getObjectId() + ") is try to cheat!");
-				return getPtLeaderText(player, (HSWorld) world);
+				_log.warning("Hall of Suffering: " + talker.getName() + "(" + talker.getObjectId() + ") is try to cheat!");
+				return getPtLeaderText(talker, (HSWorld) world);
 			}
 			else if (((HSWorld) world).isRewarded)
 			{
 				return "32530-11.htm";
 			}
-			else if ((player.getParty() != null) && (player.getParty().getLeaderObjectId() == player.getObjectId()))
+			else if ((talker.getParty() != null) && (talker.getParty().getLeaderObjectId() == talker.getObjectId()))
 			{
 				((HSWorld) world).isRewarded = true;
-				for (L2PcInstance member : player.getParty().getMembers())
+				for (L2PcInstance member : talker.getParty().getMembers())
 				{
-					final QuestState qsMember = getQuestState(member, false);
-					if (qsMember != null)
+					if (getQuestState(member, false) != null)
 					{
-						qsMember.giveItems(736, 1);
-						qsMember.giveItems(((HSWorld) world).rewardItemId, 1);
+						giveItems(talker, 736, 1);
+						giveItems(talker, ((HSWorld) world).rewardItemId, 1);
 					}
 				}
 				return "";
 			}
 			
-			return getPtLeaderText(player, (HSWorld) world);
+			return getPtLeaderText(talker, (HSWorld) world);
 		}
-		return "";
+		return super.onTalk(npc, talker);
 	}
 }

L2J_DataPack/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java

@@ -96,11 +96,7 @@ public final class Q00454_CompletelyLost extends Quest
 					double dist = Util.calculateDistance(npc, leader, false, false);
 					if (dist > 1000)
 					{
-						if ((dist > 5000) && (dist < 6900))
-						{
-							npc.teleToLocation(leader);
-						}
-						else if ((dist > 31000) && (dist < 32000))
+						if (((dist > 5000) && (dist < 6900)) || ((dist > 31000) && (dist < 32000)))
 						{
 							npc.teleToLocation(leader);
 						}
@@ -182,6 +178,7 @@ public final class Q00454_CompletelyLost extends Quest
 			}
 		}
 		
+		// For NPC-only timers, player is null and no further checks or actions are required.
 		if (player == null)
 		{
 			return null;
@@ -451,10 +448,6 @@ public final class Q00454_CompletelyLost extends Quest
 	{
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
-		if (qs == null)
-		{
-			return htmltext;
-		}
 		
 		switch (qs.getState())
 		{