From dc540ae7765ea886a740e5fd08231f5bbae723f3 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Wed, 25 Jul 2018 20:33:33 -0400 Subject: [PATCH] Remove System.out.println() stuff --- .../proxy/connection/backend/LoginSessionHandler.java | 2 -- .../proxy/connection/backend/PlaySessionHandler.java | 1 - .../proxy/connection/client/StatusSessionHandler.java | 1 - .../velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java | 1 - .../velocitypowered/proxy/protocol/netty/MinecraftDecoder.java | 1 - .../velocitypowered/proxy/protocol/netty/MinecraftEncoder.java | 1 - 6 files changed, 7 deletions(-) diff --git a/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java b/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java index 68204f1e..5fe48158 100644 --- a/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java +++ b/src/main/java/com/velocitypowered/proxy/connection/backend/LoginSessionHandler.java @@ -23,14 +23,12 @@ public class LoginSessionHandler implements MinecraftSessionHandler { } if (packet instanceof SetCompression) { - System.out.println("Enabling compression on server connection, this is inefficient!"); SetCompression sc = (SetCompression) packet; connection.getChannel().setCompressionThreshold(sc.getThreshold()); } if (packet instanceof ServerLoginSuccess) { // the player has been logged on. - System.out.println("Player connected to remote server"); connection.getChannel().setState(StateRegistry.PLAY); connection.getProxyPlayer().setConnectedServer(connection); connection.getProxyPlayer().getConnection().setSessionHandler(new com.velocitypowered.proxy.connection.client.PlaySessionHandler(connection.getProxyPlayer())); diff --git a/src/main/java/com/velocitypowered/proxy/connection/backend/PlaySessionHandler.java b/src/main/java/com/velocitypowered/proxy/connection/backend/PlaySessionHandler.java index 3f115523..1cf2636e 100644 --- a/src/main/java/com/velocitypowered/proxy/connection/backend/PlaySessionHandler.java +++ b/src/main/java/com/velocitypowered/proxy/connection/backend/PlaySessionHandler.java @@ -21,7 +21,6 @@ public class PlaySessionHandler implements MinecraftSessionHandler { if (packet instanceof Ping) { // Make sure to reply back to the server so it doesn't think we're gone. connection.getChannel().write(packet); - connection.getProxyPlayer().getConnection().write(packet); } else if (packet instanceof Disconnect) { // The server wants to disconnect us. TODO fallback handling Disconnect original = (Disconnect) packet; diff --git a/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java b/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java index 3ef492f0..825b6c5a 100644 --- a/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java +++ b/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java @@ -36,7 +36,6 @@ public class StatusSessionHandler implements MinecraftSessionHandler { } // Status request - System.out.println("Got status request!"); ServerPing ping = new ServerPing( new ServerPing.Version(340, "1.12.2"), new ServerPing.Players(0, 0), diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java b/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java index f0d5fdaa..3aa580d1 100644 --- a/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java +++ b/src/main/java/com/velocitypowered/proxy/protocol/netty/LegacyPingEncoder.java @@ -24,7 +24,6 @@ public class LegacyPingEncoder extends MessageToByteEncoder String serializedResponse = serialize(msg); out.writeShort(serializedResponse.length()); out.writeBytes(serializedResponse.getBytes(StandardCharsets.UTF_16BE)); - System.out.println(ByteBufUtil.prettyHexDump(out)); } private String serialize(LegacyPingResponse response) { diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java b/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java index a82edbaf..137d85bd 100644 --- a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java +++ b/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java @@ -40,7 +40,6 @@ public class MinecraftDecoder extends MessageToMessageDecoder { throw new CorruptedFrameException("Error decoding " + packet.getClass() + " Direction " + direction + " Protocol " + protocolVersion + " State " + state + " ID " + Integer.toHexString(packetId), e); } - System.out.println("IN: " + packet); out.add(new PacketWrapper(packet, slice)); } } diff --git a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java b/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java index 089f05ca..35130e38 100644 --- a/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java +++ b/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftEncoder.java @@ -25,7 +25,6 @@ public class MinecraftEncoder extends MessageToByteEncoder { int packetId = mappings.getId(msg); ProtocolUtils.writeVarInt(out, packetId); msg.encode(out, direction, protocolVersion); - System.out.println("OUT: " + msg); } public int getProtocolVersion() {