mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure packet hooks are called sync - thanks @aadnk for pointing this out

Browse source
This commit is contained in:
md_5 2013-07-07 09:02:13 +10:00
parent cd02250065
commit a59da621da
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
CraftBukkit-Patches/0024-Netty.patch
View file

@ -1,4 +1,4 @@
From ee8dd3943261014e8444bbfb06a3aeeb3bd587e9 Mon Sep 17 00:00:00 2001 From ebb81f5f718e2f23a77bae13b3cae39330f65e22 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000 Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty Subject: [PATCH] Netty
@ -375,10 +375,10 @@ index 0000000..2eb1dcb
+} +}
diff --git a/src/main/java/org/spigotmc/netty/NettyNetworkManager.java b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java diff --git a/src/main/java/org/spigotmc/netty/NettyNetworkManager.java b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java
new file mode 100644 new file mode 100644
index 0000000..7340f5a index 0000000..c73d70c
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java +++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java
@@ -0,0 +1,314 @@ @@ -0,0 +1,313 @@
+package org.spigotmc.netty; +package org.spigotmc.netty;
+ +
+import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -551,42 +551,41 @@ index 0000000..7340f5a
+ // Only send if channel is still connected + // Only send if channel is still connected
+ if ( connected ) + if ( connected )
+ { + {
+ if ( channel.eventLoop().inEventLoop() ) + // Process packet via handler
+ final Packet packet0 = PacketListener.callQueued( this, connection, packet );
+ highPriorityQueue.add( packet0 );
+ // If handler indicates packet send
+ if ( packet0 != null )
+ { + {
+ queue0( packet ); + if ( channel.eventLoop().inEventLoop() )
+ } else
+ {
+ channel.eventLoop().execute( new Runnable()
+ { + {
+ public void run() + queue0( packet0 );
+ } else
+ {
+ channel.eventLoop().execute( new Runnable()
+ { + {
+ queue0( packet ); + public void run()
+ } + {
+ } ); + queue0( packet0 );
+ }
+ } );
+ }
+ } + }
+ } + }
+ } + }
+ +
+ private void queue0(Packet packet) + private void queue0(Packet packet)
+ { + {
+ // Process packet via handler + if ( packet instanceof Packet255KickDisconnect )
+ packet = PacketListener.callQueued( this, connection, packet );
+ // If handler indicates packet send
+ if ( packet != null )
+ { + {
+ highPriorityQueue.add( packet ); + writer.lastFlush = 0;
+ }
+ +
+ if ( packet instanceof Packet255KickDisconnect ) + writer.write( channel, this, packet );
+ { + if ( packet instanceof Packet252KeyResponse )
+ writer.lastFlush = 0; + {
+ } + Cipher encrypt = NettyServerConnection.getCipher( Cipher.ENCRYPT_MODE, secret );
+ + channel.pipeline().addBefore( "decoder", "encrypt", new CipherEncoder( encrypt ) );
+ writer.write( channel, this, packet );
+ if ( packet instanceof Packet252KeyResponse )
+ {
+ Cipher encrypt = NettyServerConnection.getCipher( Cipher.ENCRYPT_MODE, secret );
+ channel.pipeline().addBefore( "decoder", "encrypt", new CipherEncoder( encrypt ) );
+ }
+ } + }
+ } + }
+ +