lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure sendPacket ByteBuffer has no remaining bytes.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-06-14 00:47:59 +03:00
parent 3c4449a121
commit 670b7e6982
31 changed files with 620 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -185,28 +186,34 @@ public class GameClient extends NetClient
return;
}
// Keep the order of packets if sent by multiple threads.
_pendingPackets.add(packet);
synchronized (_pendingPackets)
{
try
final SocketChannel channel = getChannel();
if ((channel != null) && channel.isConnected())
{
if ((getChannel() != null) && getChannel().isConnected())
final ServerPacket sendPacket = _pendingPackets.poll();
final ByteBuffer byteBuffer = sendPacket.getSendableByteBuffer(_encryption);
if (byteBuffer != null)
{
final ServerPacket nextPacket = _pendingPackets.poll();
final ByteBuffer byteBuffer = nextPacket.getSendableByteBuffer(_encryption);
if (byteBuffer != null)
// Send the packet data.
try
{
// Send the packet data.
getChannel().write(byteBuffer);
// Run packet implementation.
nextPacket.run(_player);
// Loop while there are remaining bytes in the buffer.
while (byteBuffer.hasRemaining())
{
channel.write(byteBuffer);
}
}
catch (Exception ignored)
{
}
// Run packet implementation.
sendPacket.run(_player);
}
}
catch (Exception ignored)
{
}
}
}