From b9d0fab57967ec2ea607c9421faf63b4bc3ffcd7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 19 Apr 2013 17:45:39 +1000 Subject: [PATCH] [Experimental] Add connection multiplexer to allow many listen blocks. Secondary listen blocks are configured in bukkit.yml --- ...ent-now-can-return-if-the-click-was-.patch | 23 +- ...ning-of-NibbleArrays-only-allocate-b.patch | 4 +- CraftBukkit-Patches/0021-Netty.patch | 386 ++++++++++-------- .../0031-Entity-Tracking-Ranges.patch | 6 +- .../0032-BungeeCord-Support.patch | 10 +- .../0033-Texture-Pack-Resolutions.patch | 6 +- .../0037-Enable-Improved-ping-sending.patch | 6 +- 7 files changed, 247 insertions(+), 194 deletions(-) diff --git a/Bukkit-Patches/0006-InventoryClickEvent-now-can-return-if-the-click-was-.patch b/Bukkit-Patches/0006-InventoryClickEvent-now-can-return-if-the-click-was-.patch index 4ee427795..dff8b5264 100644 --- a/Bukkit-Patches/0006-InventoryClickEvent-now-can-return-if-the-click-was-.patch +++ b/Bukkit-Patches/0006-InventoryClickEvent-now-can-return-if-the-click-was-.patch @@ -1,4 +1,4 @@ -From 7190ad3069d55a8a4c94d2b86f5d28f8614d0074 Mon Sep 17 00:00:00 2001 +From 2fe038efb157d93ea3e3a60eb360694ea4e57f0e Mon Sep 17 00:00:00 2001 From: Tyler Blair Date: Tue, 9 Apr 2013 17:53:31 -0300 Subject: [PATCH] InventoryClickEvent now can return if the click was a double @@ -9,15 +9,17 @@ Subject: [PATCH] InventoryClickEvent now can return if the click was a double diff --git a/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java b/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java old mode 100644 new mode 100755 -index 264ab0a..4ad1d5a +index 264ab0a..6ed1a89 --- a/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java +++ b/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java -@@ -8,8 +8,8 @@ import org.bukkit.inventory.Recipe; - public class CraftItemEvent extends InventoryClickEvent { +@@ -9,7 +9,11 @@ public class CraftItemEvent extends InventoryClickEvent { private Recipe recipe; -- public CraftItemEvent(Recipe recipe, InventoryView what, SlotType type, int slot, boolean right, boolean shift) { + public CraftItemEvent(Recipe recipe, InventoryView what, SlotType type, int slot, boolean right, boolean shift) { - super(what, type, slot, right, shift); ++ this(recipe, what, type, slot, right, shift, false); ++ } ++ + public CraftItemEvent(Recipe recipe, InventoryView what, SlotType type, int slot, boolean right, boolean shift, boolean doubleClick) { + super(what, type, slot, right, shift, doubleClick); this.recipe = recipe; @@ -26,10 +28,10 @@ index 264ab0a..4ad1d5a diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java old mode 100644 new mode 100755 -index 26e1d38..7662b5c +index 26e1d38..1c07a13 --- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java -@@ -11,17 +11,18 @@ import org.bukkit.inventory.ItemStack; +@@ -11,17 +11,22 @@ import org.bukkit.inventory.ItemStack; public class InventoryClickEvent extends InventoryEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private SlotType slot_type; @@ -40,7 +42,10 @@ index 26e1d38..7662b5c private int rawSlot; private ItemStack current = null; -- public InventoryClickEvent(InventoryView what, SlotType type, int slot, boolean right, boolean shift) { + public InventoryClickEvent(InventoryView what, SlotType type, int slot, boolean right, boolean shift) { ++ this(what, type, slot, right, shift, false); ++ } ++ + public InventoryClickEvent(InventoryView what, SlotType type, int slot, boolean right, boolean shift, boolean doubleClick) { super(what); this.slot_type = type; @@ -50,7 +55,7 @@ index 26e1d38..7662b5c this.result = Result.DEFAULT; this.rawSlot = slot; this.whichSlot = what.convertSlot(slot); -@@ -67,6 +68,13 @@ public class InventoryClickEvent extends InventoryEvent implements Cancellable { +@@ -67,6 +72,13 @@ public class InventoryClickEvent extends InventoryEvent implements Cancellable { } /** diff --git a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch index d4d200b66..15bb4ff4a 100644 --- a/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0009-Implement-lightening-of-NibbleArrays-only-allocate-b.patch @@ -1,5 +1,5 @@ -From 66e69212e40d4e2547d60dc3051c7d2271821e2b Mon Sep 17 00:00:00 2001 -From: Mike Primm +From 77baca153ffa630c0d3075f9f38d0768b1a72c70 Mon Sep 17 00:00:00 2001 +From: Mike Primm Date: Sun, 13 Jan 2013 03:49:07 -0800 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate buffers when non-trivial value Saving from 40-45% of memory use by chunk diff --git a/CraftBukkit-Patches/0021-Netty.patch b/CraftBukkit-Patches/0021-Netty.patch index f4b08f69e..32405b061 100644 --- a/CraftBukkit-Patches/0021-Netty.patch +++ b/CraftBukkit-Patches/0021-Netty.patch @@ -1,35 +1,8 @@ -From 751bd6f6c7d40e46a599cd8254cac0ef59ad5132 Mon Sep 17 00:00:00 2001 +From d2c3009e1ee527e5d6b990264190370ff50444b2 Mon Sep 17 00:00:00 2001 From: md_5 -Date: Thu, 14 Feb 2013 17:32:20 +1100 +Date: Fri, 19 Apr 2013 17:44:39 +1000 Subject: [PATCH] Netty - Implement an uber efficient network engine based on the - Java NIO framework Netty. This is basically a complete rewrite of the - Minecraft network engine with many distinct advantages. First and foremost, - there will no longer be the horrid, and redundant case of 2, or even at - times, 3 threads per a connection. Instead low level select/epoll based NIO - is used. The number of threads used for network reading and writing will - scale automatically to the number of cores for use on your server. In most - cases this will be around 8 threads for a 4 core server, much better than the - up to 1000 threads that could be in use at one time with the old engine. To - facilitate asynchronous packet sending or receiving (currently only chat), a - thread pool of 16 threads is kept handy. == Plugin incompatibilities As a - side effect of this change, plugins which rely on very specific - implementation level details within Minecraft are broken. At this point in - time, TagAPI and ProtocolLib are affected. If you are a user of ProtocolLib - you are advised to update to the latest build, where full support is enabled. - If you are a user of TagAPI, support has not yet been added, so you will need - to install the updated ProtocolLib so that TagAPI may use its functions. == - Stability The code within this commit has been very lightly tested in - production (300 players for approximately 24 hours), however it is not - guaranteed to be free from all bugs. If you experence weird connection - behaviour, reporting the bug and steps to reproduce are advised. You are also - free to downgrade to the latest recommend build, which is guaranteed to be - stable. == Summary This commit provides a reduction in threads, which gives - the CPU / operating system more time to allocate to the main server threads, - as well as various other side benefits such as chat thread pooling and a - slight reduction in latency. This commit is licensed under the Creative - Commons Attribution-ShareAlike 3.0 Unported license. diff --git a/pom.xml b/pom.xml index da1a0eb..b8c24af 100644 @@ -48,7 +21,7 @@ index da1a0eb..b8c24af 100644 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index bd7e41c..c189b1b 100644 +index bd7e41c..93cd0a9 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -60,19 +33,28 @@ index bd7e41c..c189b1b 100644 } protected boolean init() throws java.net.UnknownHostException { // CraftBukkit - throws UnknownHostException -@@ -94,7 +94,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G()); +@@ -91,10 +91,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + + this.getLogger().info("Generating keypair"); + this.a(MinecraftEncryption.b()); +- this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G()); ++ this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit try { - this.r = new DedicatedServerConnection(this, inetaddress, this.G()); -+ // Spigot start -+ this.r = (!Boolean.getBoolean("org.spigotmc.netty.disabled")) -+ ? new org.spigotmc.netty.NettyServerConnection(this, inetaddress, this.G()) -+ : new DedicatedServerConnection(this, inetaddress, this.G()); -+ // Spigot end ++ this.r = new org.spigotmc.MultiplexingServerConnection(this); // Spigot } catch (Throwable ioexception) { // CraftBukkit - IOException -> Throwable this.getLogger().warning("**** FAILED TO BIND TO PORT!"); this.getLogger().warning("The exception was: {0}", new Object[] { ioexception.toString()}); +@@ -102,8 +102,6 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + return false; + } + +- this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit +- + if (!this.getOnlineMode()) { + this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); + this.getLogger().warning("The server will make no attempt to authenticate usernames. Beware."); diff --git a/src/main/java/net/minecraft/server/INetworkManager.java b/src/main/java/net/minecraft/server/INetworkManager.java new file mode 100644 index 0000000..6fcc5d7 @@ -152,7 +134,7 @@ index 9f8afe3..b1d3a17 100644 }; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java -index eb474f5..bbf1abd 100644 +index eb474f5..71e4739 100644 --- a/src/main/java/net/minecraft/server/PendingConnection.java +++ b/src/main/java/net/minecraft/server/PendingConnection.java @@ -17,7 +17,7 @@ public class PendingConnection extends Connection { @@ -190,80 +172,20 @@ index eb474f5..bbf1abd 100644 // CraftBukkit start - Fix decompile issues, don't create a list from an array Object[] list = new Object[] { 1, 60, this.server.getVersion(), pingEvent.getMotd(), playerlist.getPlayerCount(), pingEvent.getMaxPlayers() }; -@@ -173,8 +178,8 @@ public class PendingConnection extends Connection { +@@ -173,9 +178,11 @@ public class PendingConnection extends Connection { this.networkManager.queue(new Packet255KickDisconnect(s)); this.networkManager.d(); - if (inetaddress != null && this.server.ae() instanceof DedicatedServerConnection) { - ((DedicatedServerConnection) this.server.ae()).a(inetaddress); -+ if (inetaddress != null) { // Spigot - removed DedicatedServerConnection instance check -+ this.server.ae().a(inetaddress); ++ // Spigot start ++ if (inetaddress != null) { ++ ((org.spigotmc.MultiplexingServerConnection) this.server.ae()).throttle(inetaddress); } ++ // Spigot end this.b = true; -diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -new file mode 100644 -index 0000000..0113ed3 ---- /dev/null -+++ b/src/main/java/net/minecraft/server/ServerConnection.java -@@ -0,0 +1,57 @@ -+package net.minecraft.server; -+ -+import java.net.InetAddress; -+import java.util.ArrayList; -+import java.util.Collections; -+import java.util.List; -+ -+public abstract class ServerConnection { -+ -+ private final MinecraftServer b; -+ private final List c = Collections.synchronizedList(new ArrayList()); -+ public volatile boolean a = false; -+ -+ public ServerConnection(MinecraftServer minecraftserver) { -+ this.b = minecraftserver; -+ this.a = true; -+ } -+ -+ public void a(PlayerConnection playerconnection) { -+ this.c.add(playerconnection); -+ } -+ -+ public abstract void a(InetAddress address); // Spigot - make a(InetAddress) a abstract void -+ -+ public void a() { -+ this.a = false; -+ } -+ -+ public void b() { -+ for (int i = 0; i < this.c.size(); ++i) { -+ PlayerConnection playerconnection = (PlayerConnection) this.c.get(i); -+ -+ try { -+ playerconnection.d(); -+ } catch (Exception exception) { -+ if (playerconnection.networkManager instanceof MemoryNetworkManager) { -+ CrashReport crashreport = CrashReport.a((Throwable) exception, "Ticking memory connection"); -+ -+ throw new ReportedException(crashreport); -+ } -+ -+ this.b.getLogger().warning("Failed to handle packet for " + playerconnection.player.getLocalizedName() + "/" + playerconnection.player.p() + ": " + exception, (Throwable) exception); -+ playerconnection.disconnect("Internal server error"); -+ } -+ -+ if (playerconnection.disconnected) { -+ this.c.remove(i--); -+ } -+ -+ playerconnection.networkManager.a(); -+ } -+ } -+ -+ public MinecraftServer d() { -+ return this.b; -+ } -+} + } catch (Exception exception) { diff --git a/src/main/java/net/minecraft/server/ThreadCommandReader.java b/src/main/java/net/minecraft/server/ThreadCommandReader.java index 489e184..9533b6f 100644 --- a/src/main/java/net/minecraft/server/ThreadCommandReader.java @@ -288,6 +210,39 @@ index c185f64..abe0b81 100644 this.server = server; // CraftBukkit end this.pendingConnection = pendingconnection; +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 9f2be37..c7a804b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -129,6 +129,7 @@ import com.avaje.ebean.config.dbplatform.SQLitePlatform; + import com.avaje.ebeaninternal.server.lib.sql.TransactionIsolation; + import com.google.common.collect.ImmutableList; + import com.google.common.collect.MapMaker; ++import java.net.InetSocketAddress; + + import jline.console.ConsoleReader; + +@@ -1373,4 +1374,20 @@ public final class CraftServer implements Server { + public CraftScoreboardManager getScoreboardManager() { + return scoreboardManager; + } ++ ++ // Spigot start ++ @SuppressWarnings("unchecked") ++ public java.util.Collection getSecondaryHosts() { ++ java.util.Collection ret = new java.util.HashSet(); ++ List listeners = configuration.getList("listeners"); ++ if (listeners != null) { ++ for (Object o : listeners) { ++ ++ Map sect = (Map) o; ++ ret.add(new InetSocketAddress((String) sect.get("address"), (Integer) sect.get("port"))); ++ } ++ } ++ return ret; ++ } ++ // Spigot end + } diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index 84dcfcc..a30f217 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -301,6 +256,138 @@ index 84dcfcc..a30f217 100644 private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}}; private CraftAsyncDebugger debugTail = debugHead; 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..7dc2533 +--- /dev/null ++++ b/src/main/java/org/spigotmc/MultiplexingServerConnection.java +@@ -0,0 +1,126 @@ ++package org.spigotmc; ++ ++import java.net.InetAddress; ++import java.net.InetSocketAddress; ++import java.util.ArrayList; ++import java.util.Collection; ++import java.util.Collections; ++import java.util.HashMap; ++import java.util.HashSet; ++import java.util.List; ++import java.util.logging.Level; ++import net.minecraft.server.DedicatedServerConnection; ++import net.minecraft.server.MinecraftServer; ++import net.minecraft.server.PendingConnection; ++import net.minecraft.server.ServerConnection; ++import org.bukkit.Bukkit; ++ ++public class MultiplexingServerConnection extends ServerConnection { ++ ++ private static final boolean NETTY_DISABLED = Boolean.getBoolean("org.spigotmc.netty.disabled"); ++ private final Collection children = new HashSet(); ++ private final List pending = Collections.synchronizedList(new ArrayList()); ++ private final HashMap throttle = new HashMap(); ++ ++ public MultiplexingServerConnection(MinecraftServer ms) { ++ super(ms); ++ ++ // Add primary connection ++ start(ms.server.getIp(), ms.server.getPort()); ++ // Add all other connections ++ for (InetSocketAddress address : ms.server.getSecondaryHosts()) { ++ start(address.getHostString(), address.getPort()); ++ } ++ } ++ ++ private void start(String ipAddress, int port) { ++ try { ++ // Calculate address, can't use isEmpty due to Java 5 ++ InetAddress socketAddress = (ipAddress.length() == 0) ? null : InetAddress.getByName(ipAddress); ++ // Say hello to the log ++ d().getLogger().info("Starting listener #" + children.size() + " on " + (socketAddress == null ? "*" : ipAddress) + ":" + port); ++ // Start connection: Netty / non Netty ++ ServerConnection listener = (NETTY_DISABLED) ? new DedicatedServerConnection(d(), socketAddress, port) : new org.spigotmc.netty.NettyServerConnection(d(), socketAddress, port); ++ // Register with other connections ++ children.add(listener); ++ // Gotta catch em all ++ } catch (Throwable t) { ++ // Just print some info to the log ++ t.printStackTrace(); ++ d().getLogger().warning("**** FAILED TO BIND TO PORT!"); ++ d().getLogger().warning("The exception was: {0}", t); ++ d().getLogger().warning("Perhaps a server is already running on that port?"); ++ } ++ } ++ ++ /** ++ * close. ++ */ ++ @Override ++ public void a() { ++ for (ServerConnection child : children) { ++ child.a(); ++ } ++ } ++ ++ /** ++ * Pulse. This method pulses all connections causing them to update. It is ++ * called from the main server thread a few times a tick. ++ */ ++ @Override ++ public void b() { ++ super.b(); // pulse PlayerConnections ++ for (int i = 0; i < pending.size(); ++i) { ++ PendingConnection connection = pending.get(i); ++ ++ try { ++ connection.c(); ++ } catch (Exception ex) { ++ connection.disconnect("Internal server error"); ++ Bukkit.getServer().getLogger().log(Level.WARNING, "Failed to handle packet: " + ex, ex); ++ } ++ ++ if (connection.b) { ++ pending.remove(i--); ++ } ++ } ++ } ++ ++ /** ++ * Remove the user from connection throttle. This should fix the server ping ++ * bugs. ++ * ++ * @param address the address to remove ++ */ ++ public void a(InetAddress address) { ++ if (address != null) { ++ synchronized (throttle) { ++ throttle.remove(address); ++ } ++ } ++ } ++ ++ /** ++ * Add a connection to the throttle list. ++ * ++ * @param address ++ * @return Whether they must be disconnected ++ */ ++ public boolean throttle(InetAddress address) { ++ long currentTime = System.currentTimeMillis(); ++ synchronized (throttle) { ++ Long value = throttle.get(address); ++ if (value != null && !address.isLoopbackAddress() && currentTime - value < d().server.getConnectionThrottle()) { ++ throttle.put(address, currentTime); ++ return true; ++ } ++ ++ throttle.put(address, currentTime); ++ } ++ return false; ++ } ++ ++ public void register(PendingConnection conn) { ++ pending.add(conn); ++ } ++} diff --git a/src/main/java/org/spigotmc/netty/CipherCodec.java b/src/main/java/org/spigotmc/netty/CipherCodec.java new file mode 100644 index 0000000..2dbbf6c @@ -376,10 +463,10 @@ index 0000000..2dbbf6c +} 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..85a6c05 +index 0000000..0e1b1fd --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyNetworkManager.java -@@ -0,0 +1,271 @@ +@@ -0,0 +1,253 @@ +package org.spigotmc.netty; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -387,13 +474,11 @@ index 0000000..85a6c05 +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundMessageHandlerAdapter; +import io.netty.channel.socket.SocketChannel; -+import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.security.PrivateKey; +import java.util.AbstractList; -+import java.util.HashMap; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; @@ -408,6 +493,7 @@ index 0000000..85a6c05 +import net.minecraft.server.Packet252KeyResponse; +import net.minecraft.server.PendingConnection; +import net.minecraft.server.PlayerConnection; ++import org.spigotmc.MultiplexingServerConnection; + +/** + * This class forms the basis of the Netty integration. It implements @@ -419,7 +505,7 @@ index 0000000..85a6c05 + private static final ExecutorService threadPool = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Async Packet Handler - %1$d").build()); + private static final MinecraftServer server = MinecraftServer.getServer(); + private static final PrivateKey key = server.F().getPrivate(); -+ private static final NettyServerConnection serverConnection = (NettyServerConnection) server.ae(); ++ private static final MultiplexingServerConnection serverConnection = (MultiplexingServerConnection) server.ae(); + /*========================================================================*/ + private final Queue syncPackets = new ConcurrentLinkedQueue(); + private final List highPriorityQueue = new AbstractList() { @@ -447,32 +533,15 @@ index 0000000..85a6c05 + private Object[] dcArgs; + private Socket socketAdaptor; + private long writtenBytes; -+ private long connectionThrottle; + + @Override + public void channelActive(ChannelHandlerContext ctx) throws Exception { + // Channel and address groundwork first + channel = ctx.channel(); + address = channel.remoteAddress(); -+ // Connection throttler (ported from CraftBukkit) -+ long currentTime = System.currentTimeMillis(); -+ InetAddress iaddress = ((InetSocketAddress) channel.remoteAddress()).getAddress(); -+ -+ if (server == null || server.server == null) { ++ // Check the throttle ++ if (serverConnection.throttle(((InetSocketAddress) channel.remoteAddress()).getAddress())) { + channel.close(); -+ return; -+ } -+ -+ connectionThrottle = server.server.getConnectionThrottle(); -+ -+ synchronized (serverConnection.throttledConnections) { -+ if (serverConnection.throttledConnections.containsKey(iaddress) && !"127.0.0.1".equals(iaddress.getHostAddress()) && currentTime - (serverConnection.throttledConnections.get(iaddress)).longValue() < connectionThrottle) { -+ serverConnection.throttledConnections.put(iaddress, Long.valueOf(currentTime)); -+ channel.close(); -+ return; -+ } -+ -+ serverConnection.throttledConnections.put(iaddress, Long.valueOf(currentTime)); + } + // Then the socket adaptor + socketAdaptor = NettySocketAdaptor.adapt((SocketChannel) channel); @@ -480,7 +549,7 @@ index 0000000..85a6c05 + connection = new PendingConnection(server, this); + // Finally register the connection + connected = true; -+ serverConnection.pendingConnections.add((PendingConnection) connection); ++ serverConnection.register((PendingConnection) connection); + } + + @Override @@ -653,10 +722,10 @@ index 0000000..85a6c05 +} diff --git a/src/main/java/org/spigotmc/netty/NettyServerConnection.java b/src/main/java/org/spigotmc/netty/NettyServerConnection.java new file mode 100644 -index 0000000..7809aa9 +index 0000000..e5d24f7 --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java -@@ -0,0 +1,126 @@ +@@ -0,0 +1,90 @@ +package org.spigotmc.netty; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -693,8 +762,8 @@ index 0000000..7809aa9 +public class NettyServerConnection extends ServerConnection { + + private final ChannelFuture socket; -+ final HashMap throttledConnections = new HashMap(); -+ final List pendingConnections = Collections.synchronizedList(new ArrayList()); ++ ++ + + public NettyServerConnection(MinecraftServer ms, InetAddress host, int port) { + super(ms); @@ -719,42 +788,6 @@ index 0000000..7809aa9 + MinecraftServer.getServer().getLogger().info("Using Netty NIO with " + threads + " threads for network connections."); + } + -+ /** -+ * Pulse. This method pulses all connections causing them to update. It is -+ * called from the main server thread a few times a tick. -+ */ -+ @Override -+ public void b() { -+ super.b(); // pulse PlayerConnections -+ for (int i = 0; i < pendingConnections.size(); ++i) { -+ PendingConnection connection = pendingConnections.get(i); -+ -+ try { -+ connection.c(); -+ } catch (Exception ex) { -+ connection.disconnect("Internal server error"); -+ Bukkit.getServer().getLogger().log(Level.WARNING, "Failed to handle packet: " + ex, ex); -+ } -+ -+ if (connection.b) { -+ pendingConnections.remove(i--); -+ } -+ } -+ } -+ -+ /** -+ * Remove the user from connection throttle. This should fix the server ping bugs. -+ * -+ * @param address the address to remove -+ */ -+ @Override -+ public void a(InetAddress address) { -+ if (address != null) { -+ synchronized (throttledConnections) { -+ throttledConnections.remove(address); -+ } -+ } -+ } + + /** + * Shutdown. This method is called when the server is shutting down and the @@ -1291,6 +1324,21 @@ index 0000000..5dc3754 + */ + DATA; +} +diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml +index a62ba24..aaf9454 100644 +--- a/src/main/resources/configurations/bukkit.yml ++++ b/src/main/resources/configurations/bukkit.yml +@@ -12,7 +12,9 @@ + # Twitter: http://twitter.com/Craftbukkit + # Bug tracker: http://leaky.bukkit.org/ + +- ++#listeners: ++# - address: 127.0.0.1 ++# port: 25577 + settings: + allow-end: true + warn-on-overload: true -- 1.8.2.1 diff --git a/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch index c0077eb0d..e720f641d 100644 --- a/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0031-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From f1841e1e5d2ff06132a265aab2bc0e16974bda55 Mon Sep 17 00:00:00 2001 +From bdf18ad7a72f75bbc88c511f3751cce86371c531 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -113,10 +113,10 @@ index ac99395..92259e5 100644 + } } diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index a62ba24..1a36f67 100644 +index aaf9454..3009855 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -52,6 +52,11 @@ world-settings: +@@ -54,6 +54,11 @@ world-settings: entity-activation-range-animals: 32 entity-activation-range-monsters: 32 entity-activation-range-misc: 16 diff --git a/CraftBukkit-Patches/0032-BungeeCord-Support.patch b/CraftBukkit-Patches/0032-BungeeCord-Support.patch index 17d0856bf..97fbf715f 100644 --- a/CraftBukkit-Patches/0032-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0032-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 8498d18a49bf1eb87dc630bb0dc18a9c8659af70 Mon Sep 17 00:00:00 2001 +From 6ffd3b72af6c8be496157f3902f61e66d406372e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin. diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java -index fcfc3d2..3448fc5 100644 +index 71e4739..27cf4e3 100644 --- a/src/main/java/net/minecraft/server/PendingConnection.java +++ b/src/main/java/net/minecraft/server/PendingConnection.java -@@ -219,4 +219,17 @@ public class PendingConnection extends Connection { +@@ -221,4 +221,17 @@ public class PendingConnection extends Connection { static boolean a(PendingConnection pendingconnection, boolean flag) { return pendingconnection.h = flag; } @@ -48,10 +48,10 @@ index 92259e5..b5953ce 100644 if (metrics == null) { try { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 1a36f67..968ab97 100644 +index 3009855..f1ceb44 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -34,6 +34,8 @@ settings: +@@ -36,6 +36,8 @@ settings: timeout-time: 30 restart-on-crash: false restart-script-location: /path/to/server/start.sh diff --git a/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch index c56d2661f..3fe75cfee 100644 --- a/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch +++ b/CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch @@ -1,4 +1,4 @@ -From b317f696c36b6270a2ed2e9c57a1d08c2833a8ad Mon Sep 17 00:00:00 2001 +From 62ef56febec405b4b44edf69f88b91928110af56 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 13:04:45 +1100 Subject: [PATCH] Texture Pack Resolutions @@ -52,10 +52,10 @@ index 0b5ea21..f959fdf 100644 getHandle().playerConnection.sendPacket(new Packet250CustomPayload("MC|TPack", message)); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index 968ab97..e440750 100644 +index f1ceb44..80b4feb 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -36,6 +36,7 @@ settings: +@@ -38,6 +38,7 @@ settings: restart-script-location: /path/to/server/start.sh bungee-proxies: - 127.0.0.1 diff --git a/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch index 6538e1b2d..ef5aaab3c 100644 --- a/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From de2605afefbe4286715c18e74e1d38ac8ed68e2f Mon Sep 17 00:00:00 2001 +From e55549d3056a5b72e47f0b54438c057ca4cd3182 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending @@ -48,10 +48,10 @@ index eaeb0bf..f94cc54 100644 public void sendAll(Packet packet) { for (int i = 0; i < this.players.size(); ++i) { diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index e440750..bc0b044 100644 +index 80b4feb..891d7fa 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -31,6 +31,7 @@ settings: +@@ -33,6 +33,7 @@ settings: command-complete: true spam-exclusions: - /skill