Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-09-14 16:47:50 +02:00
Code Issues Projects Releases Wiki Activity

Ensure output handlers function correctly in 1.7.2

Browse Source
This commit is contained in:
Kristian S. Stangeland 2014-03-21 22:19:24 +01:00
parent bd3a60b7eb
commit 7adb6548aa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,6 @@ import com.comphenix.protocol.utility.MinecraftMethods;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.google.common.base.Preconditions;
import com.google.common.collect.MapMaker;
import com.google.common.primitives.Bytes;
/**
* Represents a channel injector.
@ -300,8 +299,13 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
PacketEvent event = currentEvent;
NetworkMarker marker = null;
// Skip every kind of non-filtered packet
if (!scheduleProcessPackets.get()) {
return;
}
// This packet has not been seen by the main thread
if (event == null && scheduleProcessPackets.get()) {
if (event == null) {
Class<?> clazz = packet.getClass();
// Schedule the transmission on the main thread instead
@ -331,11 +335,12 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
byte[] data = getBytes(packetBuffer);
for (PacketOutputHandler handler : marker.getOutputHandlers()) {
handler.handle(event, data);
data = handler.handle(event, data);
}
// Write the result
output.writeBytes(data);
packet = null;
return;
}
} catch (Exception e) {