From b167a4569050d8a9b30b6ad4fd75710b8c4f62f4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Jun 2014 16:25:53 +1000 Subject: [PATCH] Revert "Reenable throttle since we only support 1.7+" This reverts commit f23691df232fcd7ae92d693a726fa1f053018ce8. --- proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java index e9849b5f..24261072 100644 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java @@ -36,8 +36,9 @@ public class PipelineUtils { if ( BungeeCord.getInstance().getConnectionThrottle().throttle( ( (InetSocketAddress) ch.remoteAddress() ).getAddress() ) ) { - ch.close(); - return; + // TODO: Better throttle - we can't throttle this way if we want to maintain 1.7 compat! + // ch.close(); + // return; } BASE.initChannel( ch );