SteamWar/ProtocolLib
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

Don't attempt to inject closed channels. Fixes issue #23

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Kristian S. Stangeland 2013-12-08 19:50:59 +01:00
Ursprung 20524c1c3c
Commit 1aaf272878
1 geänderte Dateien mit 8 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java
Datei anzeigen

@ -182,13 +182,18 @@ class ChannelInjector extends ByteToMessageDecoder {
/**
* Inject the current channel.
* <p>
* Note that only active channels can be injected.
* @return TRUE if we injected the channel, false if we could not inject or it was already injected.
*/
@SuppressWarnings("unchecked")
public boolean inject() {
synchronized (networkManager) {
if (originalChannel instanceof Factory)
return false;
if (!originalChannel.isActive())
return false;
// Don't inject the same channel twice
if (findChannelHandler(originalChannel, ChannelInjector.class) != null) {
// Invalidate cache
@ -202,9 +207,9 @@ class ChannelInjector extends ByteToMessageDecoder {
vanillaEncoder = (MessageToByteEncoder<Object>) originalChannel.pipeline().get("encoder");
if (vanillaDecoder == null)
throw new IllegalArgumentException("Unable to find vanilla decoder.in " + originalChannel.pipeline() + ". " + getChannelState());
throw new IllegalArgumentException("Unable to find vanilla decoder.in " + originalChannel.pipeline() );
if (vanillaEncoder == null)
throw new IllegalArgumentException("Unable to find vanilla encoder in " + originalChannel.pipeline() + ". " + getChannelState());
throw new IllegalArgumentException("Unable to find vanilla encoder in " + originalChannel.pipeline() );
patchEncoder(vanillaEncoder);
if (DECODE_BUFFER == null)
@ -245,10 +250,6 @@ class ChannelInjector extends ByteToMessageDecoder {
}
}
private String getChannelState() {
return "Registered channel: " + originalChannel.isRegistered() + ", Active channel: " + originalChannel.isActive() + ", Open channel: " + originalChannel.isOpen();
}
/**
* Process a given message on the packet listeners.
* @param message - the message/packet.