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

Properly cancel or modify packets intercepted in the channel thread.

Browse Source 
This fixes ticket #204 on BukkitDev.
This commit is contained in:
Kristian S. Stangeland 2014-03-15 19:25:40 +01:00
parent ad060b10af
commit 5e0000d139
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import com.comphenix.protocol.utility.MinecraftMethods;
import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftReflection;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;
import com.google.common.primitives.Bytes;
/** /**
* Represents a channel injector. * Represents a channel injector.
@ -311,6 +312,11 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
} else { } else {
event = processSending(packet, marker); event = processSending(packet, marker);
// Handle the output
if (event != null) {
packet = !event.isCancelled() ? event.getPacket().getHandle() : null;
}
} }
} }
if (event != null) { if (event != null) {
@ -327,6 +333,7 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
for (PacketOutputHandler handler : marker.getOutputHandlers()) { for (PacketOutputHandler handler : marker.getOutputHandlers()) {
handler.handle(event, data); handler.handle(event, data);
} }
// Write the result // Write the result
output.writeBytes(data); output.writeBytes(data);
return; return;