Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-28 05:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Prevent cancelled packets from been cancelled over and over again.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2013-12-08 00:51:46 +01:00
parent fa55e2cb27
commit a74d2ca8bc
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java
View File

@ -304,7 +304,7 @@ class ChannelInjector extends ByteToMessageDecoder {
// Schedule the transmission on the main thread instead
if (channelListener.hasMainThreadListener(clazz)) {
// Delay the packet
scheduleMainThread(marker, packet);
scheduleMainThread(packet);
packet = null;
} else {
@ -338,11 +338,14 @@ class ChannelInjector extends ByteToMessageDecoder {
}
}
private void scheduleMainThread(final NetworkMarker marker, final Object packetCopy) {
private void scheduleMainThread(final Object packetCopy) {
// Do not process this packet agai
processedPackets.add(packetCopy);
ProtocolLibrary.getExecutorSync().execute(new Runnable() {
@Override
public void run() {
sendServerPacket(packetCopy, marker, true);
invokeSendPacket(packetCopy);
}
});
}
@ -433,7 +436,14 @@ class ChannelInjector extends ByteToMessageDecoder {
} else {
ignoredPackets.remove(packet);
}
invokeSendPacket(packet);
}
/**
* Invoke the sendPacket method in Minecraft.
* @param packet - the packet to send.
*/
private void invokeSendPacket(Object packet) {
// Attempt to send the packet with NetworkMarker.handle(), or the PlayerConnection if its active
try {
if (player instanceof Factory) {

4
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java
View File

@ -91,7 +91,7 @@ abstract class ChannelProxy implements Channel {
if (packet != null)
accessor.set(runnable, packet);
else
getEmptyRunnable();
return getEmptyRunnable();
}
return runnable;
}
@ -106,7 +106,7 @@ abstract class ChannelProxy implements Channel {
if (packet != null)
accessor.set(callable, packet);
else
getEmptyCallable();
return getEmptyCallable();
}
return callable;
}