diff --git a/CraftBukkit-Patches/0025-Netty.patch b/CraftBukkit-Patches/0025-Netty.patch index 3580a888d4..1c28215e0c 100644 --- a/CraftBukkit-Patches/0025-Netty.patch +++ b/CraftBukkit-Patches/0025-Netty.patch @@ -1,4 +1,4 @@ -From 3df1d5381bb92c7c9897dad4bd92282d898791ba Mon Sep 17 00:00:00 2001 +From a5d4b285e25b3a33d99c7ac0afe4075422da7b5a Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 23 Jun 2013 16:32:51 +1000 Subject: [PATCH] Netty @@ -357,7 +357,7 @@ index 0000000..5de1c62 + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index b7f3896..910d0de 100644 +index b7f3896..8a99179 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -6,6 +6,8 @@ import java.io.IOException; @@ -398,7 +398,7 @@ index b7f3896..910d0de 100644 + def.put( "host", "default" ); + def.put( "port", "default" ); + def.put( "netty", true ); -+ def.put( "throttle", "default" ); ++ // def.put( "throttle", "default" ); + + config.addDefault( "listeners", Collections.singletonList( def ) ); + for ( Map info : (List>) config.getList( "listeners" ) ) @@ -410,8 +410,8 @@ index b7f3896..910d0de 100644 + } + int port = ( info.get( "port" ) instanceof Integer ) ? (Integer) info.get( "port" ) : Bukkit.getPort(); + boolean netty = (Boolean) info.get( "netty" ); -+ long connectionThrottle = ( info.get( "throttle" ) instanceof Number ) ? ( (Number) info.get( "throttle" ) ).longValue() : Bukkit.getConnectionThrottle(); -+ listeners.add( new Listener( host, port, netty, connectionThrottle ) ); ++ // long connectionThrottle = ( info.get( "throttle" ) instanceof Number ) ? ( (Number) info.get( "throttle" ) ).longValue() : Bukkit.getConnectionThrottle(); ++ listeners.add( new Listener( host, port, netty, Bukkit.getConnectionThrottle() ) ); + } + + nettyThreads = getInt( "settings.netty-threads", 3 );