Update upstream BD/B/CB/S

Note to other developers: This commit may require you to wipe your
workspace as a result of the changes to BD.

--- work/BuildData
Submodule work/BuildData f527a8ff..d56672db:
  > Mappings Update

--- work/Bukkit
Submodule work/Bukkit 0c1d258bb..db06c80d7:
  > Add list of entities to EntityTransformEvent
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks

---work/CraftBukkit
Submodule work/CraftBukkit 6a398ac..068dab5:
  > Enable optional source JAR shading via profile shadeSourcesJar
  > Use ImmutableList rather than AbstractList for CraftMetaBook
  > Fix setRecipes(List) not setting Knowledge Book recipes.
  > Mappings Update
  > Add list of entities to EntityTransformEvent & move die calls
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks
  > Add Vanilla help to default permissions

--- work/Spigot
Submodule work/Spigot a1f2566f6..e769fe4d9:
  > Mappings Update
  > Rebuild patches

Spigot-API-Patches/0036-Add-EntityZapEvent.patch

@@ -1,15 +1,15 @@
-From d10ee21db91d466d499e140a462b37f04f22c787 Mon Sep 17 00:00:00 2001
+From 2527eb4a36c059f3c42f5fc5dbac73c6021c6d10 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 00000000..3547d063
+index 00000000..c8f0bb05
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,63 @@
 +package com.destroystokyo.paper.event.entity;
 +
 +import org.apache.commons.lang.Validate;
@@ -21,6 +21,7 @@ index 00000000..3547d063
 +import org.bukkit.event.entity.EntityTransformEvent;
 +
 +import javax.annotation.Nonnull;
++import java.util.Collections;
 +
 +/**
 + *  Fired when lightning strikes an entity
@@ -31,7 +32,7 @@ index 00000000..3547d063
 +    private final LightningStrike bolt;
 +
 +    public EntityZapEvent(final Entity entity, @Nonnull final LightningStrike bolt, @Nonnull final Entity replacementEntity) {
-+        super(entity, replacementEntity, TransformReason.LIGHTNING);
++        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
 +        Validate.notNull(bolt);
 +        Validate.notNull(replacementEntity);
 +        this.bolt = bolt;
@@ -73,17 +74,18 @@ index 00000000..3547d063
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 86983676..8dd1e3ce 100644
+index c1d4b30a..de8cad81 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-@@ -1,5 +1,6 @@
- package org.bukkit.event.entity;
+@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
 
+ import java.util.Collections;
+ import org.bukkit.entity.Entity;
 +import com.destroystokyo.paper.event.entity.EntityZapEvent;
  import org.bukkit.entity.LightningStrike;
  import org.bukkit.entity.Pig;
  import org.bukkit.entity.PigZombie;
-@@ -9,14 +10,14 @@ import org.bukkit.event.HandlerList;
+@@ -11,14 +12,14 @@ import org.bukkit.event.HandlerList;
  /**
   * Stores data for pigs being zapped
   */
@@ -96,12 +98,12 @@ index 86983676..8dd1e3ce 100644
      private final LightningStrike bolt;
 
      public PigZapEvent(final Pig pig, final LightningStrike bolt, final PigZombie pigzombie) {
--        super(pig, pigzombie, TransformReason.LIGHTNING);
+-        super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
 +        super(pig, bolt, pigzombie);
          this.bolt = bolt;
          this.pigzombie = pigzombie;
      }
-@@ -55,6 +56,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -57,6 +58,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
          return pigzombie;
      }
 
@@ -110,13 +112,13 @@ index 86983676..8dd1e3ce 100644
      @Override
      public HandlerList getHandlers() {
          return handlers;
-@@ -63,4 +66,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
+@@ -65,4 +68,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
      public static HandlerList getHandlerList() {
          return handlers;
      }
 +    */
 +    // Paper end
  }
 -- 
-2.19.1
+2.19.2
 

Spigot-API-Patches/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch

@@ -1,4 +1,4 @@
-From 790d964de5cce64ce961552f37ee17e35bf1477d Mon Sep 17 00:00:00 2001
+From ceef7057702a9be623ecad7664d826ab2516bd0e Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
@@ -217,10 +217,10 @@ index fe8d3468..074769c1 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 2278d470..60ed443a 100644
+index df51f3ca..e9f640fb 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -81,13 +81,13 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -82,13 +82,13 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
       * <p>
       * Plugins should check if hasLore() returns <code>true</code> before
       * calling this method.
@@ -236,7 +236,7 @@ index 2278d470..60ed443a 100644
       * Removes lore when given null.
       *
       * @param lore the lore that will be set
-@@ -118,7 +118,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -119,7 +119,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
      int getEnchantLevel(Enchantment ench);
 
      /**
@@ -245,7 +245,7 @@ index 2278d470..60ed443a 100644
       * Returns an empty map if none.
       *
       * @return An immutable copy of the enchantments
-@@ -348,4 +348,83 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
+@@ -365,4 +365,83 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
 
      Spigot spigot();
      // Spigot end
@@ -330,5 +330,5 @@ index 2278d470..60ed443a 100644
 +    // Paper end
  }
 -- 
-2.19.1
+2.19.2
 

Spigot-Server-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 4319757a25f8a0f330e9925ab19944eb2d4c337c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ccf92b011..f0fc37abf 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,11 @@
@@ -106,11 +106,12 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                              <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -182,19 +171,22 @@
+@@ -182,20 +171,23 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
 +                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
+                             <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <relocations>
 -                                <relocation>
 -                                    <pattern>joptsimple</pattern>
@@ -137,7 +138,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -220,18 +212,6 @@
+@@ -221,18 +213,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.7.0</version>
@@ -157,7 +158,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 93046379d..674096cab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -170,5 +171,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 
          if (stream != null) {
 -- 
-2.19.1
+2.19.2