From f962379477c9bc10c9c0e6b371b98b9400e9a1ba Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 20 Apr 2013 17:14:54 +1000 Subject: [PATCH] Java 5/6 compat. NETBEANS! --- CraftBukkit-Patches/0021-Netty.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0021-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch index 6fa289dddb..7723ae830f 100644 --- a/CraftBukkit-Patches/0021-Netty.patch +++ b/CraftBukkit-Patches/0021-Netty.patch @@ -1,4 +1,4 @@ -From e2f25a41e80e4c9ece6059b2808f003a49556769 Mon Sep 17 00:00:00 2001 +From efe9a9aecb849b6886372c7d9445cd79dd706687 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 19 Apr 2013 17:44:39 +1000 Subject: [PATCH] Netty @@ -285,7 +285,7 @@ index 84dcfcc..a30f217 100644 private static final int RECENT_TICKS; diff --git a/src/main/java/org/spigotmc/MultiplexingServerConnection.java b/src/main/java/org/spigotmc/MultiplexingServerConnection.java new file mode 100644 -index 0000000..6e5de56 +index 0000000..c8ea80a --- /dev/null +++ b/src/main/java/org/spigotmc/MultiplexingServerConnection.java @@ -0,0 +1,126 @@ @@ -320,7 +320,7 @@ index 0000000..6e5de56 + start(ms.server.getIp(), ms.server.getPort()); + // Add all other connections + for (InetSocketAddress address : ms.server.getSecondaryHosts()) { -+ start(address.getHostString(), address.getPort()); ++ start(address.getAddress().getHostAddress(), address.getPort()); + } + } +