Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Don't load permissions from waterfall.yml (broken in upstream)

Browse Source
This commit is contained in:
Shane Freeder 2018-12-21 15:43:20 +00:00
parent 6b32122de3
commit 61b6cadebb
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -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> From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400 Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files 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 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 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/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 @@ -44,10 +44,15 @@ public class YamlConfig implements ConfigurationAdapter
@ -109,6 +109,14 @@ index 0ec6dabb..e517ea5d 100644
{ {
try 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 2.20.1