[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
310dc809 Add ServerLoadEvent

CraftBukkit Changes:
19d654bd Add ServerLoadEvent
This commit is contained in:
Aikar
2018-09-07 23:49:37 -04:00
parent 2571276390
commit d617f95f05
31 changed files with 188 additions and 188 deletions

View File

@@ -1,4 +1,4 @@
From 9970b4b70fa0d3caf070bd3f2fcf1df6da43678f Mon Sep 17 00:00:00 2001
From fab72b2e76c85b539ad0724105bfc169115a453b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,10 +30,10 @@ index fd00c320ce..620f23f4f0 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bd99aa72c4..8d059d75ac 100644
index d7c0d9a9c7..53914172b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -333,6 +333,7 @@ public final class CraftServer implements Server {
@@ -334,6 +334,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index bd99aa72c4..8d059d75ac 100644
}
Plugin[] plugins = pluginManager.getPlugins();
@@ -350,7 +351,7 @@ public final class CraftServer implements Server {
@@ -351,7 +352,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false);
// Spigot end
commandMap.registerServerAliases();