Finally fix for Free teleport html's

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2NpcInstance.java

@@ -1789,13 +1789,6 @@ public class L2NpcInstance extends L2Character
     	
     	if (getTemplate().type == "L2Auctioneer" && val==0)
             return;
-    	
-    	if (getTemplate().type == "L2Teleporter" && val == 1 && player.getLevel() < 41)
-    	{
-    		getHtmlPath(getTemplate().npcId, 1000);
-    		return;
-    	}
-    		
 
         int npcId = getTemplate().npcId;
         

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2TeleporterInstance.java

@@ -127,7 +127,25 @@ public final class L2TeleporterInstance extends L2FolkInstance
 				return;
 			}
 		}
-		
+		else if (command.startsWith("Chat"))
+		{
+			int val = 0;
+			try
+			{
+				val = Integer.parseInt(command.substring(5));
+			}
+			catch (IndexOutOfBoundsException ioobe)
+			{}
+			catch (NumberFormatException nfe)
+			{}
+			
+			if (val == 1 && player.getLevel() < 41)
+			{
+				showNewbieHtml(player);
+				return;
+			}
+			showChatWindow(player, val);
+		}
 		super.onBypassFeedback(player, command);
 	}
 	
@@ -139,14 +157,6 @@ public final class L2TeleporterInstance extends L2FolkInstance
 		{
 			pom = "" + npcId;
 		}
-		else if (val == 1000)
-		{
-			pom = "data/html/teleporter/free/" + npcId + ".htm";
-			if (!HtmCache.getInstance().isLoadable(pom))
-				return "data/html/teleporter/" + npcId + "-1.htm";
-			else
-				return pom;
-		}
 		else
 		{
 			pom = npcId + "-" + val;
@@ -155,6 +165,23 @@ public final class L2TeleporterInstance extends L2FolkInstance
 		return "data/html/teleporter/" + pom + ".htm";
 	}
 	
+	private void showNewbieHtml(L2PcInstance player)
+	{
+		if (player == null)
+			return;
+		
+		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		
+		String filename = "data/html/teleporter/free/" + getTemplate().npcId + ".htm";
+		if (!HtmCache.getInstance().isLoadable(filename))
+			filename = "data/html/teleporter/" + getTemplate().npcId + "-1.htm";
+		
+		html.setFile(filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		html.replace("%npcname%", getName());
+		player.sendPacket(html);
+	}
+	
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{