From 485c3856c1bd8d6e3940905bb18bb57550732a6f Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Thu, 27 Mar 2014 23:23:45 +0100 Subject: [PATCH] Don't fetch NetworkMarker uncessarily. --- .../protocol/injector/netty/ChannelInjector.java | 13 ++----------- .../protocol/injector/netty/ChannelListener.java | 3 +-- .../injector/netty/NettyProtocolInjector.java | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java index 5d630ad4..9f0f412e 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java @@ -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) { diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java index b3251fc8..9593f656 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java @@ -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. diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java index 582f1045..deb8b15d 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java @@ -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)) {