[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,14 +1,14 @@
From 8bee6fed99116e8b3f4119b9e2c82c1d2cf0f30d Mon Sep 17 00:00:00 2001
From d984d7e1d0d05306603e3207a824a46dc4e968db Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:15:57 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e047d68f3e..6a7bdb9ab6 100644
index 4512fb0b82..82ca56b680 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1609,6 +1609,7 @@ public final class CraftServer implements Server {
@@ -1611,6 +1611,7 @@ public final class CraftServer implements Server {
return helpMap;
}