Update upstream B/CB/S

--- work/Bukkit
Submodule work/Bukkit 1627782b..67e91ef7:
  > Fix some incorrectly handled JavaDoc
  > SPIGOT-4478: Update PlayerLoginEvent docs
  > Add API to manipulate boss bar of entities and those created by commands

--- work/CraftBukkit
Submodule work/CraftBukkit ca22de36..3a911828:
  > SPIGOT-4477: Arrows only firing direction of boat
  > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation
  > Add API to manipulate boss bar of entities and those created by commands

--- work/Spigot
Submodule work/Spigot 2474d93d..947a8e7f:
  > Rebuild patches
This commit is contained in:
Zach Brown
2018-11-11 00:37:15 -05:00
parent 8b8e15fb63
commit dcebe229b5
45 changed files with 359 additions and 426 deletions

View File

@@ -1,14 +1,14 @@
From 329d2e7e15e9a401aeab8a4c96fd32e738800d57 Mon Sep 17 00:00:00 2001
From 95dbbc6f6a22b1e3d43ab82d83945f79b59dcf01 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 7f711cd642..267224c69c 100644
index 2bc16fb1a..cd17cdcf3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1638,6 +1638,7 @@ public final class CraftServer implements Server {
@@ -1641,6 +1641,7 @@ public final class CraftServer implements Server {
return helpMap;
}
@@ -17,5 +17,5 @@ index 7f711cd642..267224c69c 100644
return commandMap;
}
--
2.19.0
2.19.1