From 61b6cadebb232df0082e2d76bfaeac6303473782 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 21 Dec 2018 15:43:20 +0000
Subject: [PATCH] Don't load permissions from waterfall.yml (broken in
 upstream)

---
 .../0004-Add-Waterfall-configuration-files.patch     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
index 9daa3d9..9eb893e 100644
--- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
@@ -1,4 +1,4 @@
-From a3365b8976e6e8c5825dce8e65089a173ae1af58 Mon Sep 17 00:00:00 2001
+From 973e7912eb74dc03e2b4d1906ced46b5504935f8 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -76,7 +76,7 @@ index 36cac069..dddc57a8 100644
  
      /**
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 0ec6dabb..e517ea5d 100644
+index 0ec6dabb..44011a96 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -44,10 +44,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -109,6 +109,14 @@ index 0ec6dabb..e517ea5d 100644
      {
          try
          {
+@@ -83,6 +93,7 @@ public class YamlConfig implements ConfigurationAdapter
+             throw new RuntimeException( "Could not load configuration!", ex );
+         }
+ 
++        if(!doPermissions) return; // Waterfall
+         Map<String, Object> permissions = get( "permissions", null );
+         if ( permissions == null )
+         {
 -- 
 2.20.1