From 58045e60d1012c7d6f97cf4a4bb84bfef8bfd091 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 19 Sep 2013 17:59:24 +1000 Subject: [PATCH] Fix custom outdated server/client messages --- CraftBukkit-Patches/0072-CraftBukkit-1.6.3.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0072-CraftBukkit-1.6.3.patch b/CraftBukkit-Patches/0072-CraftBukkit-1.6.3.patch index 6f89e44ec2..c6bc468480 100644 --- a/CraftBukkit-Patches/0072-CraftBukkit-1.6.3.patch +++ b/CraftBukkit-Patches/0072-CraftBukkit-1.6.3.patch @@ -1,4 +1,4 @@ -From 9eb9856577fc7eedc8baad15a2a8e3b36c8cbb4a Mon Sep 17 00:00:00 2001 +From 6ebb859022ca7e456aa6825d406c7eebd2d0a3be Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 19 Sep 2013 17:13:43 +1000 Subject: [PATCH] CraftBukkit 1.6.3 @@ -144,7 +144,7 @@ index d186e47..964a168 100644 return minecraftserver.t; } diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java -index a5c3104..e670481 100644 +index a5c3104..ee77687 100644 --- a/src/main/java/net/minecraft/server/PendingConnection.java +++ b/src/main/java/net/minecraft/server/PendingConnection.java @@ -68,29 +68,27 @@ public class PendingConnection extends Connection { @@ -174,9 +174,9 @@ index a5c3104..e670481 100644 - this.disconnect(org.spigotmc.SpigotConfig.outdatedServerMessage); // Spigot + if (packet2handshake.d() != 77) { + if (packet2handshake.d() > 77) { -+ this.disconnect("Outdated server!"); ++ this.disconnect(org.spigotmc.SpigotConfig.outdatedServerMessage); // Spigot + } else { -+ this.disconnect("Outdated client!"); ++ this.disconnect(org.spigotmc.SpigotConfig.outdatedClientMessage); // Spigot + } } else { - this.disconnect(org.spigotmc.SpigotConfig.outdatedClientMessage); // Spigot