diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
| commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
| tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/HandshakeListener.patch | |
| parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
| download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip | |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/HandshakeListener.patch')
| -rw-r--r-- | nms-patches/HandshakeListener.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nms-patches/HandshakeListener.patch b/nms-patches/HandshakeListener.patch index 4d95bd5f..3a6a8c1c 100644 --- a/nms-patches/HandshakeListener.patch +++ b/nms-patches/HandshakeListener.patch @@ -1,6 +1,6 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/HandshakeListener.java 2014-11-28 17:43:43.193707433 +0000 -+++ src/main/java/net/minecraft/server/HandshakeListener.java 2014-11-28 17:38:22.000000000 +0000 -@@ -1,6 +1,16 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/HandshakeListener.java 2015-02-26 22:40:22.755608138 +0000 ++++ src/main/java/net/minecraft/server/HandshakeListener.java 2015-02-26 22:40:22.755608138 +0000 +@@ -1,7 +1,17 @@ package net.minecraft.server; +// CraftBukkit start @@ -9,19 +9,19 @@ +// CraftBukkit end + public class HandshakeListener implements PacketHandshakingInListener { -+ + + // CraftBukkit start - add fields + private static final HashMap<InetAddress, Long> throttleTracker = new HashMap<InetAddress, Long>(); + private static int throttleCounter = 0; + // CraftBukkit end - ++ private final MinecraftServer a; private final NetworkManager b; -@@ -15,6 +25,41 @@ - case 1: + +@@ -16,6 +26,41 @@ this.b.a(EnumProtocol.LOGIN); ChatComponentText chatcomponenttext; -+ + + // CraftBukkit start - Connection throttle + try { + long currentTime = System.currentTimeMillis(); @@ -56,9 +56,10 @@ + org.apache.logging.log4j.LogManager.getLogger().debug("Failed to check connection throttle", t); + } + // CraftBukkit end - ++ if (packethandshakinginsetprotocol.b() > 47) { - chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8"); + chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.3"); + this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); @@ -26,6 +71,7 @@ this.b.close(chatcomponenttext); } else { |