Flip netty/non netty so correct setting is used, still looking into throttle
This commit is contained in:
parent
33a79925d8
commit
7b558570ea
1 changed files with 3 additions and 3 deletions
|
@ -1,4 +1,4 @@
|
|||
From a5d4b285e25b3a33d99c7ac0afe4075422da7b5a Mon Sep 17 00:00:00 2001
|
||||
From 621ccf948dca29b783bec47193d22a899efb586d Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 23 Jun 2013 16:32:51 +1000
|
||||
Subject: [PATCH] Netty
|
||||
|
@ -215,7 +215,7 @@ index 6e6fe1c..68694de 100644
|
|||
}
|
||||
diff --git a/src/main/java/org/spigotmc/MultiplexingServerConnection.java b/src/main/java/org/spigotmc/MultiplexingServerConnection.java
|
||||
new file mode 100644
|
||||
index 0000000..5de1c62
|
||||
index 0000000..29bb610
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/spigotmc/MultiplexingServerConnection.java
|
||||
@@ -0,0 +1,137 @@
|
||||
|
@ -256,7 +256,7 @@ index 0000000..5de1c62
|
|||
+ // Say hello to the log
|
||||
+ d().getLogger().info( "Starting listener #" + children.size() + " on " + ( socketAddress == null ? "*" : listener.host ) + ":" + listener.port );
|
||||
+ // Start connection: Netty / non Netty
|
||||
+ ServerConnection l = ( listener.netty ) ? new DedicatedServerConnection( d(), socketAddress, listener.port ) : new NettyServerConnection( d(), socketAddress, listener.port );
|
||||
+ ServerConnection l = ( listener.netty ) ? new NettyServerConnection( d(), socketAddress, listener.port ) : new DedicatedServerConnection( d(), socketAddress, listener.port );
|
||||
+ // Register with other connections
|
||||
+ children.add( l );
|
||||
+ // Gotta catch em all
|
||||
|
|
Loading…
Reference in a new issue