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

Don't fetch NetworkMarker uncessarily.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2014-03-27 23:23:45 +01:00
parent 3b26940385
commit 485c3856c1
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,16 +257,7 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
* @return The resulting message/packet.
*/
private PacketEvent processSending(Object message) {
return processSending(message, packetMarker.get(message));
}
/**
* Process a given message on the packet listeners.
* @param message - the message/packet.
* @return The resulting message/packet.
*/
private PacketEvent processSending(Object message, NetworkMarker marker) {
return channelListener.onPacketSending(ChannelInjector.this, message, marker);
return channelListener.onPacketSending(ChannelInjector.this, message);
}
/**
@ -315,7 +306,7 @@ class ChannelInjector extends ByteToMessageDecoder implements Injector {
packet = null;
} else {
event = processSending(packet, marker);
event = processSending(packet);
// Handle the output
if (event != null) {

3
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java
View File

@ -16,10 +16,9 @@ interface ChannelListener {
* This is invoked on the main thread.
* @param injector - the channel injector.
* @param packet - the packet.
* @param marker - the associated network marker, if any.
* @return The packet even that was passed to the listeners, with a possible packet change, or NULL.
*/
public PacketEvent onPacketSending(Injector injector, Object packet, NetworkMarker marker);
public PacketEvent onPacketSending(Injector injector, Object packet);
/**
* Invoked when a packet is being received from a client.

2
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java
View File

@ -227,7 +227,7 @@ public class NettyProtocolInjector implements ChannelListener {
}
@Override
public PacketEvent onPacketSending(Injector injector, Object packet, NetworkMarker marker) {
public PacketEvent onPacketSending(Injector injector, Object packet) {
Class<?> clazz = packet.getClass();
if (sendingFilters.contains(clazz)) {