From 3860a7b2281c8828c7c6addfbbc6205b9df242db Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 11 Dec 2013 11:25:32 +1100 Subject: [PATCH] Bring bungee support back in line with what the protocol update had --- .../0004-Spigot-Configuration.patch | 8 ++++---- CraftBukkit-Patches/0065-BungeeCord-Support.patch | 15 ++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index 9752c913a1..aa71d20487 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 6c24c2f11d8ddf8838037e7bad98339784d72b54 Mon Sep 17 00:00:00 2001 +From c43f6a61f267c258f692714f79098b096fc8c176 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -94,7 +94,7 @@ index 15a5a5d..93e1782 100644 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java new file mode 100644 -index 0000000..2f2752a +index 0000000..e7f6401 --- /dev/null +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -0,0 +1,120 @@ @@ -144,8 +144,8 @@ index 0000000..2f2752a + + commands = new HashMap(); + -+ version = getInt( "config-version", 3 ); -+ set( "config-version", 3 ); ++ version = getInt( "config-version", 4 ); ++ set( "config-version", 4 ); + readConfig( SpigotConfig.class, null ); + } + diff --git a/CraftBukkit-Patches/0065-BungeeCord-Support.patch b/CraftBukkit-Patches/0065-BungeeCord-Support.patch index dd0a597597..1d5ec59d41 100644 --- a/CraftBukkit-Patches/0065-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0065-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From bdc4682b80e5ea2f0907dbe9be34c610b7ba9697 Mon Sep 17 00:00:00 2001 +From b11af60198e1cf24cacc156876794fda7aaa2d72 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -39,17 +39,22 @@ index 8f829bb..42e6311 100644 private EnumProtocol n; private IChatBaseComponent o; diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 3039634..ca393d0 100644 +index 801b071..3ed1c29 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -187,4 +187,9 @@ public class SpigotConfig +@@ -187,4 +187,14 @@ public class SpigotConfig commands.put( "restart", new RestartCommand( "restart" ) ); WatchdogThread.doStart( timeoutTime, restartOnCrash ); } + -+ public static boolean bungee = true; ++ public static boolean bungee; + private static void bungee() { -+ bungee = getBoolean("settings.bungeecord", true); ++ if ( version < 4 ) ++ { ++ set( "settings.bungeecord", false ); ++ System.out.println( "Oudated config, disabling BungeeCord support!" ); ++ } ++ bungee = getBoolean( "settings.bungeecord", false ); + } } --