From cb11c55f816b5e2efaf0d06310a25037d91b7373 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 10 Feb 2013 15:12:35 +1100 Subject: [PATCH] Add volatile to be sure the JVM wont cache the value --- CraftBukkit-Patches/0026-Netty.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0026-Netty.patch b/CraftBukkit-Patches/0026-Netty.patch index fdf5f7b2e6..cf0d05073b 100644 --- a/CraftBukkit-Patches/0026-Netty.patch +++ b/CraftBukkit-Patches/0026-Netty.patch @@ -1,4 +1,4 @@ -From 2157375faa240c2018b84e0d3f421fe9c9c10917 Mon Sep 17 00:00:00 2001 +From 16294b7515b83c209c7160e9966fce2fa8dc84e0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 10:24:33 +1100 Subject: [PATCH] Netty @@ -199,7 +199,7 @@ index 0000000..cfc0535 +} diff --git a/src/main/java/org/spigotmc/netty/NettyNetworkManager.java b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java new file mode 100644 -index 0000000..3801c0e +index 0000000..46493ef --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java @@ -0,0 +1,224 @@ @@ -240,7 +240,7 @@ index 0000000..3801c0e + private static final NettyServerConnection serverConnection = (NettyServerConnection) server.ae(); + /*========================================================================*/ + static final int LEGACY_PING_TIME = 1000; -+ Packet254GetInfo pingRequest; ++ volatile Packet254GetInfo pingRequest; + long lastPingRead; + /*========================================================================*/ + private Queue syncPackets = new ConcurrentLinkedQueue();