Nothing done
This commit is contained in:
parent
18ab3e8014
commit
19a0d8e408
|
@ -13,18 +13,13 @@ public class ChannelWrapper {
|
|||
private volatile boolean closed;
|
||||
|
||||
public ChannelWrapper(final ChannelHandlerContext ctx) {
|
||||
System.out.println("ChannelWrapper created");
|
||||
this.ch = ctx.channel();
|
||||
}
|
||||
|
||||
public synchronized void write(final Object packet) { // This is a problem, the packets ARE being sent but they are null
|
||||
public synchronized void write(final Object packet) {
|
||||
if (!this.closed) {
|
||||
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
|
||||
StackTraceElement element = stackTrace[2];
|
||||
System.out.println("null packets coming from: " + element.getClassName()); // UserConnection
|
||||
ChannelFuture cf = this.ch.write(packet);
|
||||
if (!cf.isSuccess()) {
|
||||
System.out.println("Couldnt send packet: " + cf.cause());
|
||||
}
|
||||
this.ch.write(packet);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,9 +47,9 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter {
|
|||
}
|
||||
|
||||
public void messageReceived(final ChannelHandlerContext ctx, final MessageList<Object> msgs) throws Exception {
|
||||
System.out.println("[HandlerBoss] - Message (packet?) received");
|
||||
for (final Object msg : msgs) {
|
||||
if (this.handler != null && ctx.channel().isActive()) {
|
||||
//System.out.println("[HandlerBoss] - Message (packet?) received");
|
||||
if (msg instanceof PacketWrapper) {
|
||||
boolean sendPacket = true;
|
||||
try {
|
||||
|
@ -65,9 +65,6 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter {
|
|||
this.handler.handle((byte[]) msg);
|
||||
}
|
||||
}
|
||||
else {
|
||||
System.out.println("Handler null or channel down");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,71 +1,65 @@
|
|||
//
|
||||
// Decompiled by Procyon v0.5.36
|
||||
//
|
||||
|
||||
package net.md_5.bungee.protocol.packet;
|
||||
|
||||
import java.beans.ConstructorProperties;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public abstract class DefinedPacket
|
||||
{
|
||||
|
||||
public abstract class DefinedPacket {
|
||||
private final int id;
|
||||
|
||||
public final int getId()
|
||||
{
|
||||
return id;
|
||||
public final int getId() {
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public DefinedPacket(int id){
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void writeString(String s, ByteBuf buf)
|
||||
{
|
||||
// TODO: Check len - use Guava?
|
||||
public void writeString(final String s, final ByteBuf buf) {
|
||||
buf.writeShort(s.length());
|
||||
for ( char c : s.toCharArray() )
|
||||
{
|
||||
buf.writeChar( c );
|
||||
for (final char c : s.toCharArray()) {
|
||||
buf.writeChar((int) c);
|
||||
}
|
||||
}
|
||||
|
||||
public String readString(ByteBuf buf)
|
||||
{
|
||||
// TODO: Check len - use Guava?
|
||||
short len = buf.readShort();
|
||||
char[] chars = new char[ len ];
|
||||
for ( int i = 0; i < len; i++ )
|
||||
{
|
||||
public String readString(final ByteBuf buf) {
|
||||
final short len = buf.readShort();
|
||||
final char[] chars = new char[len];
|
||||
for (int i = 0; i < len; ++i) {
|
||||
chars[i] = buf.readChar();
|
||||
}
|
||||
return new String(chars);
|
||||
}
|
||||
|
||||
public void writeArray(byte[] b, ByteBuf buf)
|
||||
{
|
||||
// TODO: Check len - use Guava?
|
||||
public void writeArray(final byte[] b, final ByteBuf buf) {
|
||||
buf.writeShort(b.length);
|
||||
buf.writeBytes(b);
|
||||
}
|
||||
|
||||
public byte[] readArray(ByteBuf buf)
|
||||
{
|
||||
// TODO: Check len - use Guava?
|
||||
short len = buf.readShort();
|
||||
byte[] ret = new byte[ len ];
|
||||
public byte[] readArray(final ByteBuf buf) {
|
||||
final short len = buf.readShort();
|
||||
final byte[] ret = new byte[len];
|
||||
buf.readBytes(ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
public abstract void read(ByteBuf buf);
|
||||
public abstract void read(final ByteBuf p0);
|
||||
|
||||
public abstract void write(ByteBuf buf);
|
||||
public abstract void write(final ByteBuf p0);
|
||||
|
||||
public abstract void handle(AbstractPacketHandler handler) throws Exception;
|
||||
public abstract void handle(final AbstractPacketHandler p0) throws Exception;
|
||||
|
||||
@Override
|
||||
public abstract boolean equals(Object obj);
|
||||
public abstract boolean equals(final Object p0);
|
||||
|
||||
@Override
|
||||
public abstract int hashCode();
|
||||
|
||||
@Override
|
||||
public abstract String toString();
|
||||
|
||||
@ConstructorProperties({ "id" })
|
||||
public DefinedPacket(final int id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue