Update upstream B/CB/S

--- work/Bukkit
Submodule work/Bukkit aba2aaaf..949124e0:
  > SPIGOT-5121: Method to set PierceLevel of arrows

--- work/CraftBukkit
Submodule work/CraftBukkit c6997924..bf329334:
  > SPIGOT-5133: Throwing items into secondary end world portal causes crash
  > SPIGOT-5121: Method to set PierceLevel of arrows
  > SPIGOT-5122: Skip world#notify if sign has no world.
  > SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items.
  > SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading

--- work/Spigot
Submodule work/Spigot 595711b0..935adb34:
  > SPIGOT-5088: Additional growth modifiers
This commit is contained in:
Zach Brown
2019-07-01 23:51:06 -05:00
parent edd3e778c4
commit dafc3dbcd5
40 changed files with 338 additions and 435 deletions

View File

@@ -1,14 +1,14 @@
From 7b1c27b9b534e8a68fb8a302f8bcb1488c990875 Mon Sep 17 00:00:00 2001
From 0be1866a0173faf7f37d642e2aa563d50210ffe3 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 7f1620906c..5a745c76ad 100644
index 3883d6816..63bd74f78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1582,6 +1582,7 @@ public final class CraftServer implements Server {
@@ -1585,6 +1585,7 @@ public final class CraftServer implements Server {
return helpMap;
}