Browse Source

BETA: Core-Part for [DP9036] (Removing the terrible hack)

Rumen Nikiforov 12 years ago
parent
commit
993b72e7ce
1 changed files with 2 additions and 10 deletions
  1. 2 10
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

+ 2 - 10
L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -2368,22 +2368,14 @@ public class Quest extends ManagedScript
 	 * @return
 	 */
 	public String getHtm(String prefix, String fileName)
-	{	
+	{
 		String content = HtmCache.getInstance().getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getDescr().toLowerCase() + "/" + getName() + "/" + fileName);
 		if (content == null)
 		{
 			content = HtmCache.getInstance().getHtm(prefix, "data/scripts/quests/Q" + getName() + "/" + fileName);
 			if (content == null)
 			{
-				// UnAfraid: TODO: Temp fix must be removed once all quests are updated.
-				if (getQuestIntId() > 0)
-				{
-					content = HtmCache.getInstance().getHtm(prefix, "data/scripts/quests/Q" + String.format("%05d", getQuestIntId()) + "_" + getName().split("_")[1] + "/" + fileName);
-				}
-				if (content == null)
-				{
-					content = HtmCache.getInstance().getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
-				}
+				content = HtmCache.getInstance().getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
 			}
 		}
 		return content;