Update upstream

patches/api/0001-Rebrand.patch

@@ -1,15 +1,15 @@
-From ffa35dba22251b8317f83f702357707dca9fde81 Mon Sep 17 00:00:00 2001
+From 54a9be260f9d24b37ddf635cd8b7cfee6ab99bf5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 30 Apr 2019 13:50:41 -0600
-Subject: [PATCH] Rebrand Purpur
+Date: Sat, 4 May 2019 00:57:16 -0500
+Subject: [PATCH] Rebrand
 
 ---
- pom.xml                                       | 10 ++++-----
+ pom.xml                                       |  8 +++----
  .../command/defaults/VersionCommand.java      | 21 +++++++++++--------
- 2 files changed, 17 insertions(+), 14 deletions(-)
+ 2 files changed, 16 insertions(+), 13 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 3347be41..c6b3aaec 100644
+index 13cdc25f..1e24fd1e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,17 +4,17 @@
@@ -28,18 +28,17 @@ index 3347be41..c6b3aaec 100644
      <version>1.13.2-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
--    <name>Paper-API</name>
+     <name>Paper-API</name>
 -    <url>https://github.com/PaperMC/Paper</url>
-+    <name>Purpur-API</name>
 +    <url>https://github.com/pl3xgaming/Purpur</url>
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 5cebb245..e3efafdc 100644
+index ee07fe5e..0c4e8604 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -207,8 +207,8 @@ public class VersionCommand extends BukkitCommand {
+@@ -214,8 +214,8 @@ public class VersionCommand extends BukkitCommand {
      private void obtainVersion() {
          String version = Bukkit.getVersion();
          if (version == null) version = "Custom";
@@ -50,10 +49,10 @@ index 5cebb245..e3efafdc 100644
              int distance = getDistance(null, parts[0]);
              switch (distance) {
                  case -1:
-@@ -259,13 +259,16 @@ public class VersionCommand extends BukkitCommand {
+@@ -266,13 +266,16 @@ public class VersionCommand extends BukkitCommand {
  
      // Paper start
-     private static int getDistance(String repo, String verInfo) {
+     private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
 -        try {
 -            int currentVer = Integer.decode(verInfo);
 -            return getFromJenkins(currentVer);

patches/api/0002-cows-to-mooshroom-when-fed-mushrooms.patch

@@ -1,4 +1,4 @@
-From c52f2d6be3d4fa135ab7f0841acb6cc3f235673f Mon Sep 17 00:00:00 2001
+From c5475c4147ad18323c8dc56755e7b6f8df714870 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:21:23 -0500
 Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -8,10 +8,10 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
  1 file changed, 6 insertions(+)
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-index d9e5cab9..6c163bd4 100644
+index 12194f1f..8b2e533d 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
-@@ -76,6 +76,12 @@ public class EntityTransformedEvent extends EntityEvent implements Cancellable {
+@@ -83,6 +83,12 @@ public class EntityTransformedEvent extends EntityEvent implements Cancellable {
           * When a mooshroom turns to a cow
           */
          SHEARED,

patches/api/0003-PlayerFeedAnimalEvent.patch

@@ -1,19 +1,19 @@
-From a9c7ccafda0a5fa8c590bd072fc980e707664479 Mon Sep 17 00:00:00 2001
+From 6ea8d9ee2c3ef9e7ab8195adc60b025838161e68 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:39:28 -0500
 Subject: [PATCH] PlayerFeedAnimalEvent
 
 ---
- .../purpur/event/PlayerFeedAnimalEvent.java   | 63 +++++++++++++++++++
- 1 file changed, 63 insertions(+)
+ .../purpur/event/PlayerFeedAnimalEvent.java   | 69 +++++++++++++++++++
+ 1 file changed, 69 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
 new file mode 100644
-index 00000000..e2bb0694
+index 00000000..0174eb90
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerFeedAnimalEvent.java
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,69 @@
 +package net.pl3x.purpur.event;
 +
 +import org.bukkit.entity.Animals;
@@ -22,6 +22,7 @@ index 00000000..e2bb0694
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
 +import org.bukkit.inventory.ItemStack;
++import org.jetbrains.annotations.NotNull;
 +
 +public class PlayerFeedAnimalEvent extends EntityEvent implements Cancellable {
 +    private static final HandlerList handlers = new HandlerList();
@@ -29,13 +30,14 @@ index 00000000..e2bb0694
 +    private final ItemStack itemStack;
 +    private boolean cancel;
 +
-+    public PlayerFeedAnimalEvent(Animals entity, Player player, ItemStack food) {
++    public PlayerFeedAnimalEvent(@NotNull Animals entity, @NotNull Player player, @NotNull ItemStack food) {
 +        super(entity);
 +        this.player = player;
 +        this.itemStack = food;
 +    }
 +
 +    @Override
++    @NotNull
 +    public Animals getEntity() {
 +        return (Animals) entity;
 +    }
@@ -45,6 +47,7 @@ index 00000000..e2bb0694
 +     *
 +     * @return Player who is involved in this event
 +     */
++    @NotNull
 +    public Player getPlayer() {
 +        return player;
 +    }
@@ -54,6 +57,7 @@ index 00000000..e2bb0694
 +     *
 +     * @return ItemStack being fed
 +     */
++    @NotNull
 +    public ItemStack getItemStack() {
 +        return itemStack;
 +    }
@@ -69,10 +73,12 @@ index 00000000..e2bb0694
 +    }
 +
 +    @Override
++    @NotNull
 +    public HandlerList getHandlers() {
 +        return handlers;
 +    }
 +
++    @NotNull
 +    public static HandlerList getHandlerList() {
 +        return handlers;
 +    }

patches/api/0004-Expose-Animals-isBreedingItem-ItemStack.patch

@@ -1,4 +1,4 @@
-From c1a6fb2046fc75a43cb341155a469a1b22a1243d Mon Sep 17 00:00:00 2001
+From 2c54818037c32884b46e0263e6fba858f997ac61 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:45:26 -0500
 Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
@@ -8,13 +8,13 @@ Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Animals.java b/src/main/java/org/bukkit/entity/Animals.java
-index 6e214bf4..1295a41e 100644
+index 3d4f8c3d..1f0cd380 100644
 --- a/src/main/java/org/bukkit/entity/Animals.java
 +++ b/src/main/java/org/bukkit/entity/Animals.java
-@@ -22,4 +22,14 @@ public interface Animals extends Ageable {
-      * @param uuid new uuid, or null
+@@ -51,4 +51,14 @@ public interface Animals extends Ageable {
+      * @param ticks the love mode ticks. Must be positive
       */
-     void setBreedCause(UUID uuid);
+     void setLoveModeTicks(int ticks);
 +
 +    // Purpur start
 +    /**
@@ -23,7 +23,7 @@ index 6e214bf4..1295a41e 100644
 +     * @param itemstack ItemStack to check
 +     * @return True if animal can be bred with ItemStack
 +     */
-+    boolean isBreedingItem(org.bukkit.inventory.ItemStack itemstack);
++    boolean isBreedingItem(@Nullable org.bukkit.inventory.ItemStack itemstack);
 +    // Purpur end
  }
 -- 

patches/api/0005-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From 6816e0b0ac5b4b26973d7dc7e454c7ce9958bc0c Mon Sep 17 00:00:00 2001
+From 16828d4dec0fbb8ce61a353ec4c952e4937211e8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 06:08:35 -0500
 Subject: [PATCH] Integrate ridables
@@ -8,10 +8,10 @@ Subject: [PATCH] Integrate ridables
  1 file changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 34a8fe3f..a292ea93 100644
+index 956d6886..c10e735e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -635,4 +635,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      boolean isHandRaised();
      // Paper end