Преглед на файлове

BETA: Reverting [4538] Actually there is a limit it may not be 8192 but that doesn't means there isn't at all.
+ L2GameClient/Server Packets loggers update

Rumen Nikiforov преди 13 години
родител
ревизия
3c7794356c

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java

@@ -31,12 +31,11 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
  */
 public abstract class L2GameClientPacket extends ReceivablePacket<L2GameClient>
 {
-	protected static final Logger _log = Logger.getLogger(L2GameClientPacket.class.getName());
+	protected final Logger _log = Logger.getLogger(getClass().getName());
 	
 	@Override
 	public boolean read()
 	{
-		// _log.info(this.getType());
 		try
 		{
 			readImpl();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.network.L2GameClient;
  */
 public abstract class L2GameServerPacket extends SendablePacket<L2GameClient>
 {
-	private static final Logger _log = Logger.getLogger(L2GameServerPacket.class.getName());
+	protected final Logger _log = Logger.getLogger(getClass().getName());
 	
 	protected boolean _invisible = false;
 	

+ 9 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/NpcHtmlMessage.java

@@ -14,12 +14,11 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.clientpackets.RequestBypassToServer;
 
 
 
@@ -133,7 +132,6 @@ public final class NpcHtmlMessage extends L2GameServerPacket
 	// d is usually 0, S is the html text starting with <html> and ending with </html>
 	//
 	private static final String _S__1B_NPCHTMLMESSAGE = "[S] 19 NpcHtmlMessage";
-	private static Logger _log = Logger.getLogger(RequestBypassToServer.class.getName());
 	private int _npcObjId;
 	private String _html;
 	private int _itemId = 0;
@@ -181,12 +179,17 @@ public final class NpcHtmlMessage extends L2GameServerPacket
 	
 	public void setHtml(String text)
 	{
-		if(!text.contains("<html>"))
+		if (text.length() > 17200)
+		{
+			_log.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable());
+			_html = text.substring(0, 17200);
+		}
+		if (!text.contains("<html>"))
 			text = "<html><body>" + text + "</body></html>";
-
+		
 		_html = text;
 	}
-	
+
 	public boolean setFile(String prefix, String path)
 	{
 		String content = HtmCache.getInstance().getHtm(prefix, path);