aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch')
-rw-r--r--Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
index 57868d36fe..754df1bdd7 100644
--- a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From cca72bb299e1dd0f6028b3cecaddbf0e1b5aa518 Mon Sep 17 00:00:00 2001
+From 057e2622c79809d9cdf41b2ee46117c09af465c2 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,10 +30,10 @@ index 65fc0cb..7da844e 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03bc017..54cea6a 100644
+index c61752b..e2afd9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -317,6 +317,7 @@ public final class CraftServer implements Server {
+@@ -318,6 +318,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index 03bc017..54cea6a 100644
}
Plugin[] plugins = pluginManager.getPlugins();
-@@ -334,7 +335,7 @@ public final class CraftServer implements Server {
+@@ -335,7 +336,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false);
// Spigot end
commandMap.registerServerAliases();