From c4163f30c62ccafb49f8264d09dc8e95d036f711 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 15:48:42 +1000 Subject: [PATCH] Fix Bungee support --- CraftBukkit-Patches/0030-BungeeCord-Support.patch | 6 +++--- CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CraftBukkit-Patches/0030-BungeeCord-Support.patch b/CraftBukkit-Patches/0030-BungeeCord-Support.patch index 5e987113fe..8acafa1536 100644 --- a/CraftBukkit-Patches/0030-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0030-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 150ae92bc058a84187b9c27bd4f65ff27728638d Mon Sep 17 00:00:00 2001 +From e42391b2cf58e4cfb9c1ab46114c17c515466c77 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -75,7 +75,7 @@ index 7cae665..21141f2 100644 public Spigot spigot() diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 910d0de..b71d425 100644 +index 910d0de..b341ee8 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException; @@ -97,7 +97,7 @@ index 910d0de..b71d425 100644 + public static boolean bungee = true; + private static void bungee() + { -+ bungeeAddresses = getList( "settings.bungeecord-addresses", bungee ); ++ bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses ); + bungee = getBoolean( "settings.bungeecord", true ); + } } diff --git a/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch index 272fa30e2a..9fbfb21c22 100644 --- a/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch @@ -1,4 +1,4 @@ -From ca4219456ce6b7f5ea1b18b4b7adce3fc08f9cf1 Mon Sep 17 00:00:00 2001 +From 8a38b66a6ab4ae5fb449f416bbb221cafd591326 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:59:22 +1000 Subject: [PATCH] Spam Filter Exclusions @@ -19,11 +19,11 @@ index 998ac8d..a292c1a 100644 Waitable waitable = new Waitable() { @Override diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index b71d425..1685d9f 100644 +index b341ee8..24b4aa0 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -204,4 +204,13 @@ public class SpigotConfig - bungeeAddresses = getList( "settings.bungeecord-addresses", bungee ); + bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses ); bungee = getBoolean( "settings.bungeecord", true ); } +