Browse Source

Core support for future more accurate find dualbox.
Mysql-connector lib update.

JIV 15 năm trước cách đây
mục cha
commit
5bcea6636a

+ 2 - 3
L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -451,10 +451,9 @@ public class LoginServerThread extends Thread
 		}
 	}
 	
-	public void sendClientTracert(String account, String pcIp, 
-			String hop1, String hop2, String hop3, String hop4)
+	public void sendClientTracert(String account, String[] adress)
 	{
-		PlayerTracert ptc = new PlayerTracert(account, pcIp, hop1, hop2, hop3, hop4);
+		PlayerTracert ptc = new PlayerTracert(account, adress[0], adress[1], adress[2], adress[3], adress[4]);
 		try
 		{
 			sendPacket(ptc);

+ 1 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -1004,6 +1004,7 @@ public class Olympiad
 		}
 		catch (ArrayIndexOutOfBoundsException e)
 		{
+			_log.log(Level.SEVERE, "removeSpectator()", e);
 		}
 	}
 	

+ 12 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -96,6 +96,8 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 	private boolean _isDetached = false;
 
 	private boolean _protocol;
+	
+	private int[][] trace;
 
 	public L2GameClient(MMOConnection<L2GameClient> con)
 	{
@@ -771,4 +773,14 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 		closeNow();
 		return false;
 	}
+	
+	public void setClientTracert(int[][] tracert)
+	{
+		trace = tracert;
+	}
+
+	public int[][] getTrace()
+	{
+		return trace;
+	}
 }

+ 12 - 13
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -100,11 +100,7 @@ public class EnterWorld extends L2GameClientPacket
 
 	private static Logger _log = Logger.getLogger(EnterWorld.class.getName());
 	
-	private String _userHost;
-	private String _routeHop1;
-	private String _routeHop2;
-	private String _routeHop3;
-	private String _routeHop4;
+	private int[][] tracert = new int[5][4];
 
 	public TaskPriority getPriority()
 	{
@@ -121,11 +117,9 @@ public class EnterWorld extends L2GameClientPacket
 		readD();				// Unknown Value
 		readB(new byte[32]);	// Unknown Byte Array
 		readD();				// Unknown Value
-		_userHost  = readC()+"."+readC()+"."+readC()+"."+readC();
-		_routeHop1 = readC()+"."+readC()+"."+readC()+"."+readC();
-		_routeHop2 = readC()+"."+readC()+"."+readC()+"."+readC();
-		_routeHop3 = readC()+"."+readC()+"."+readC()+"."+readC();
-		_routeHop4 = readC()+"."+readC()+"."+readC()+"."+readC();
+		for (int i = 0; i < 5; i++)
+			for (int o = 0; o < 4; o++)
+				tracert[i][o] = readC();
 	}
 
 	@Override
@@ -140,9 +134,14 @@ public class EnterWorld extends L2GameClientPacket
 			return;
 		}
 		
-		LoginServerThread.getInstance().sendClientTracert(activeChar.getAccountName(),
-				_userHost, _routeHop1, _routeHop2, _routeHop3, _routeHop4);
-
+		String[] adress = new String[5];
+		for (int i = 0; i < 5; i++)
+			adress[i] = tracert[i][0]+"."+tracert[i][1]+"."+tracert[i][2]+"."+tracert[i][3];
+		
+		LoginServerThread.getInstance().sendClientTracert(activeChar.getAccountName(), adress);
+		
+		getClient().setClientTracert(tracert);
+		
 		// Restore to instanced area if enabled
 		if (Config.RESTORE_PLAYER_INSTANCE)
 			activeChar.setInstanceId(InstanceManager.getInstance().getPlayerInstance(activeChar.getObjectId()));

+ 1 - 1
L2_GameServer/launcher/L2 GameServer.launch

@@ -26,7 +26,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/trove-2.1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mysql-connector-java-5.1.11-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mysql-connector-java-5.1.12-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/netcon.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;L2_GameServer&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;datapack_development&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>

+ 1 - 1
L2_GameServer/launcher/L2 LoginServer.launch

@@ -26,7 +26,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/trove-2.1.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mysql-connector-java-5.1.11-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mysql-connector-java-5.1.12-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/netcon.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;L2_GameServer&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;datapack_development&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>

BIN
L2_GameServer/lib/mysql-connector-java-5.1.11-bin.jar


BIN
L2_GameServer/lib/mysql-connector-java-5.1.12-bin.jar