From 1763250105f963b8596f465643783e508bc8d64d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 21 Jun 2021 09:41:00 +0100
Subject: [PATCH] Fix early load perms patch (Fixes #5917)

---
 .../Default-loading-permissions.yml-before-plugins.patch  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/server/Default-loading-permissions.yml-before-plugins.patch b/patches/server/Default-loading-permissions.yml-before-plugins.patch
index d2c0188246..f3384027ac 100644
--- a/patches/server/Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/Default-loading-permissions.yml-before-plugins.patch
@@ -34,13 +34,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
- 
-         if (!Main.useConsole) {
-             this.getLogger().info("Console input is disabled due to --noconsole command argument");
+         if (type == PluginLoadOrder.STARTUP) {
+             this.helpMap.clear();
+             this.helpMap.initializeGeneralTopics();
 +            if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions(); // Paper
          }
  
-         this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
+         Plugin[] plugins = this.pluginManager.getPlugins();
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
              this.commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();