Update to 1.14

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "Paper"]
         path = Paper
         url = https://github.com/PaperMC/Paper.git
-        branch = master
+        branch = ver/1.14-pre5

current-paper

@@ -1 +1 @@
-1.13.2--68781abc035f77c64c2ef6961375df70ae357e83
+1.14--4168b329732ffe495224049fa0e0b8fec6acbb40

patches/api/0001-Rebrand.patch

@@ -1,18 +1,18 @@
-From 54a9be260f9d24b37ddf635cd8b7cfee6ab99bf5 Mon Sep 17 00:00:00 2001
+From 7b6ccc334157135036716bd93907cbb34f28cd82 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Rebrand
 
 ---
- pom.xml                                       |  8 +++----
+ pom.xml                                       |  9 ++++----
  .../command/defaults/VersionCommand.java      | 21 +++++++++++--------
- 2 files changed, 16 insertions(+), 13 deletions(-)
+ 2 files changed, 16 insertions(+), 14 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 13cdc25f..1e24fd1e 100644
+index 81aefdf7..d73f48ae 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -4,17 +4,17 @@
+@@ -4,18 +4,17 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -23,9 +23,10 @@ index 13cdc25f..1e24fd1e 100644
          <version>dev-SNAPSHOT</version>
      </parent>
  
+-    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-api</artifactId>
 +    <artifactId>purpur-api</artifactId>
-     <version>1.13.2-R0.1-SNAPSHOT</version>
+     <version>1.14-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
      <name>Paper-API</name>
@@ -35,10 +36,10 @@ index 13cdc25f..1e24fd1e 100644
  
      <properties>
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index ee07fe5e..0c4e8604 100644
+index a36ab04c..42c88ae1 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -214,8 +214,8 @@ public class VersionCommand extends BukkitCommand {
+@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
      private void obtainVersion() {
          String version = Bukkit.getVersion();
          if (version == null) version = "Custom";
@@ -49,7 +50,7 @@ index ee07fe5e..0c4e8604 100644
              int distance = getDistance(null, parts[0]);
              switch (distance) {
                  case -1:
-@@ -266,13 +266,16 @@ public class VersionCommand extends BukkitCommand {
+@@ -263,13 +263,16 @@ public class VersionCommand extends BukkitCommand {
  
      // Paper start
      private static int getDistance(@NotNull String repo, @NotNull String verInfo) {

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

@@ -1,4 +1,4 @@
-From 2c54818037c32884b46e0263e6fba858f997ac61 Mon Sep 17 00:00:00 2001
+From 0598f218844ed5949808033cb1502ae3f2eab089 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,10 +8,10 @@ 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 3d4f8c3d..1f0cd380 100644
+index 1047481e..939f131f 100644
 --- a/src/main/java/org/bukkit/entity/Animals.java
 +++ b/src/main/java/org/bukkit/entity/Animals.java
-@@ -51,4 +51,14 @@ public interface Animals extends Ageable {
+@@ -50,4 +50,14 @@ public interface Animals extends Ageable {
       * @param ticks the love mode ticks. Must be positive
       */
      void setLoveModeTicks(int ticks);

patches/api/0005-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 5b9dd7186e204dd62aa6430c2dc97f639a8d0cb8 Mon Sep 17 00:00:00 2001
+From c9c5d4932bf02be755c90c32d537803076bb30f5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -8,10 +8,10 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
  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 956d6886..a3baaecb 100644
+index fe87caf1..d737937e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -655,4 +655,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      boolean isHandRaised();
      // Paper end

patches/api/0006-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From e8f6e9aeba7fe0b9bca877c2df79fea8c3ca9472 Mon Sep 17 00:00:00 2001
+From dc4ce39da212c22db5f734553ebd96371012b628 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, 14 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a3baaecb..097e82a0 100644
+index d737937e..cf9dde56 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -664,5 +664,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -670,5 +670,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);

patches/server/0001-Rebrand.patch

@@ -1,4 +1,4 @@
-From 42e69a8ea10cb6eff36dd87d4381021b248f5baf Mon Sep 17 00:00:00 2001
+From a9c61ea092067c2508ba72f175fbde0e29602260 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -12,7 +12,7 @@ Subject: [PATCH] Rebrand
  5 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 9cbd4880f..caae26eb4 100644
+index 8c18a0c09..dcbf59fbe 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -22,7 +22,7 @@ index 9cbd4880f..caae26eb4 100644
 -    <artifactId>paper</artifactId>
 +    <artifactId>purpur</artifactId>
      <packaging>jar</packaging>
-     <version>1.13.2-R0.1-SNAPSHOT</version>
+     <version>1.14-R0.1-SNAPSHOT</version>
 -    <name>Paper</name>
 -    <url>https://papermc.io</url>
 +    <name>Purpur</name>
@@ -51,7 +51,7 @@ index 9cbd4880f..caae26eb4 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -136,7 +136,7 @@
+@@ -143,7 +143,7 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -60,7 +60,7 @@ index 9cbd4880f..caae26eb4 100644
          <defaultGoal>clean install</defaultGoal> <!-- Paper -->
          <plugins>
              <plugin>
-@@ -144,7 +144,7 @@
+@@ -151,7 +151,7 @@
                  <artifactId>gitdescribe-maven-plugin</artifactId>
                  <version>1.3</version>
                  <configuration>
@@ -70,7 +70,7 @@ index 9cbd4880f..caae26eb4 100644
                  </configuration>
                  <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 688b4715e..e4522e68f 100644
+index cd6e25923..bb227bc0f 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -83,10 +83,10 @@ index 688b4715e..e4522e68f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8db5c6a35..16c2e1dac 100644
+index 33c7a295e..f6e27f2fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1348,7 +1348,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
+@@ -1405,7 +1405,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -96,11 +96,11 @@ index 8db5c6a35..16c2e1dac 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e5242f9f8..11f65e085 100644
+index d18a530a4..347e3f918 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -169,7 +169,7 @@ import javax.annotation.Nonnull; // Paper
- 
+@@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper
+ import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
 -    private final String serverName = "Paper"; // Paper

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

@@ -1,4 +1,4 @@
-From 406e7fabf130b3e736f3eb27569874723f4e44d8 Mon Sep 17 00:00:00 2001
+From 77b4e1d3418d77638669726c7b9bccb3325f28a1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -9,22 +9,22 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
  2 files changed, 45 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 581c78e00..89a8bbe33 100644
+index 23f910187..7bdc0f4a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1082,6 +1082,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -995,6 +995,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
 +    public void playSound(SoundEffect soundeffect, float volume, float pitch) { a(soundeffect, volume, pitch); } // Paper - OBFHELPER
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
-             this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.bV(), f, f1);
+             this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1);
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index cc53e915d..efd2a0ee7 100644
+index d2c2e3cc3..0139688c7 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
-@@ -21,7 +21,7 @@ public class EntityCow extends EntityAnimal {
+@@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal {
          this.goalSelector.a(0, new PathfinderGoalFloat(this));
          this.goalSelector.a(1, new PathfinderGoalPanic(this, 2.0D));
          this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
@@ -33,16 +33,16 @@ index cc53e915d..efd2a0ee7 100644
          this.goalSelector.a(4, new PathfinderGoalFollowParent(this, 1.25D));
          this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
-@@ -59,6 +59,8 @@ public class EntityCow extends EntityAnimal {
-         return LootTables.S;
+@@ -55,6 +55,8 @@ public class EntityCow extends EntityAnimal {
+         return 0.4F;
      }
  
 +    private int mushroomsFed = 0; // Purpur
 +
+     @Override
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
          ItemStack itemstack = entityhuman.b(enumhand);
- 
-@@ -82,6 +84,47 @@ public class EntityCow extends EntityAnimal {
+@@ -79,6 +81,47 @@ public class EntityCow extends EntityAnimal {
              // CraftBukkit end
  
              return true;

patches/server/0003-PlayerFeedAnimalEvent.patch

@@ -1,4 +1,4 @@
-From efc21635e384f64394f2b9c50b73bd235f200f1c Mon Sep 17 00:00:00 2001
+From 50e421da6a6620d15e29fb476577b0ff445b0c65 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:39:38 -0500
 Subject: [PATCH] PlayerFeedAnimalEvent
@@ -8,24 +8,24 @@ Subject: [PATCH] PlayerFeedAnimalEvent
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
-index 31ca1f80..26c43ac6 100644
+index dbce8a866..8a4594654 100644
 --- a/src/main/java/net/minecraft/server/EntityAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityAnimal.java
-@@ -99,6 +99,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimal {
+@@ -110,6 +110,7 @@ public abstract class EntityAnimal extends EntityAgeable {
          return 1 + this.world.random.nextInt(3);
      }
  
-+    public boolean isBreedingItem(ItemStack itemstack) { return f(itemstack); } // Purpur - OBFHELPER
-     public boolean f(ItemStack itemstack) {
++    public boolean isBreedingItem(ItemStack itemstack) { return i(itemstack); } // Purpur - OBFHELPER
+     public boolean i(ItemStack itemstack) {
          return itemstack.getItem() == Items.WHEAT;
      }
-@@ -106,7 +107,7 @@ public abstract class EntityAnimal extends EntityAgeable implements IAnimal {
+@@ -118,7 +119,7 @@ public abstract class EntityAnimal extends EntityAgeable {
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
          ItemStack itemstack = entityhuman.b(enumhand);
  
--        if (this.f(itemstack)) {
+-        if (this.i(itemstack)) {
 +        if (this.isBreedingItem(itemstack) && new net.pl3x.purpur.event.PlayerFeedAnimalEvent((org.bukkit.entity.Animals) getBukkitEntity(), (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), itemstack.asBukkitCopy()).callEvent()) { // Purpur
-             if (this.getAge() == 0 && this.dD()) {
+             if (this.getAge() == 0 && this.ea()) {
                  this.a(entityhuman, itemstack);
                  this.f(entityhuman);
 -- 

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

@@ -1,4 +1,4 @@
-From 39c6bbb0f6744af41f73aa9e1fce7b542d4795d7 Mon Sep 17 00:00:00 2001
+From 57f8d250f1af0e3b93e1168e2a5c5711c4f97d71 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:45:45 -0500
 Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
@@ -8,12 +8,12 @@ Subject: [PATCH] Expose Animals#isBreedingItem(ItemStack)
  1 file changed, 7 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
-index b06909c3e..63ddecb1a 100644
+index 599db583b..fa8ca2168 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
 @@ -47,4 +47,11 @@ public class CraftAnimals extends CraftAgeable implements Animals {
      public int getLoveModeTicks() {
-         return getHandle().bC; // PAIL rename loveTicks
+         return getHandle().loveTicks;
      }
 +
 +    // Purpur start

patches/server/0005-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -1,4 +1,4 @@
-From a676b948f70d903d53d3483320b507b19e100740 Mon Sep 17 00:00:00 2001
+From e08952bd0dd95decb187f18b812d85e27d476e38 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:53:16 -0500
 Subject: [PATCH] Fix cow rotation when shearing mooshroom
@@ -8,23 +8,23 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
  1 file changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 638dbe978..4a74145bc 100644
+index 76712996f..d2de3589a 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-@@ -44,7 +44,13 @@ public class EntityMushroomCow extends EntityCow {
+@@ -92,7 +92,13 @@ public class EntityMushroomCow extends EntityCow {
  
-                 entitycow.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
-                 entitycow.setHealth(this.getHealth());
-+                // Purpur start - correctly copy rotation
-+                entitycow.u(this);
-                 entitycow.aQ = this.aQ;
-+                entitycow.aS = this.aS;
-+                entitycow.lastYaw = this.lastYaw;
-+                entitycow.lastPitch = this.lastPitch;
-+                // Purpur end
-                 if (this.hasCustomName()) {
-                     entitycow.setCustomName(this.getCustomName());
-                 }
+                     entitycow.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
+                     entitycow.setHealth(this.getHealth());
++                    // Purpur start - correctly copy rotation
++                    entitycow.u(this);
+                     entitycow.aK = this.aK;
++                    entitycow.aM = this.aM;
++                    entitycow.lastYaw = this.lastYaw;
++                    entitycow.lastPitch = this.lastPitch;
++                    // Purpur end
+                     if (this.hasCustomName()) {
+                         entitycow.setCustomName(this.getCustomName());
+                     }
 -- 
 2.20.1
 

patches/server/0006-Snowman-set-pumpkin-on-off-by-player-interaction.patch

@@ -1,26 +1,25 @@
-From e560363dbb4d096d26d2b6d6e184426d9e9193d5 Mon Sep 17 00:00:00 2001
+From 545452f08d19964e93df05345cbd7e405c583077 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman set pumpkin on/off by player interaction
 
 ---
- .../net/minecraft/server/EntitySnowman.java   | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
+ .../net/minecraft/server/EntitySnowman.java     | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index b5c2fd92..7518d997 100644
+index 8677f0818..c13dfc6cc 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
-@@ -7,7 +7,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
- // CraftBukkit end
+@@ -8,6 +8,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent;
  
  public class EntitySnowman extends EntityGolem implements IRangedEntity {
--
-+    private static final RecipeItemStack PUMPKIN = RecipeItemStack.a(Blocks.PUMPKIN.getItem(), Blocks.CARVED_PUMPKIN.getItem(), Blocks.JACK_O_LANTERN.getItem()); // Purpur
-     private static final DataWatcherObject<Byte> a = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a);
  
-     public EntitySnowman(World world) {
-@@ -107,7 +107,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
++    private static final RecipeItemStack PUMPKIN = RecipeItemStack.a(Blocks.PUMPKIN.getItem(), Blocks.CARVED_PUMPKIN.getItem(), Blocks.JACK_O_LANTERN.getItem()); // Purpur
+     private static final DataWatcherObject<Byte> b = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a);
+ 
+     public EntitySnowman(EntityTypes<? extends EntitySnowman> entitytypes, World world) {
+@@ -112,7 +113,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
      protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
          ItemStack itemstack = entityhuman.b(enumhand);
  
@@ -29,10 +28,10 @@ index b5c2fd92..7518d997 100644
              // CraftBukkit start
              PlayerShearEntityEvent event = new PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity());
              this.world.getServer().getPluginManager().callEvent(event);
-@@ -119,6 +119,21 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
- 
-             this.setHasPumpkin(false);
-             itemstack.damage(1, entityhuman);
+@@ -126,6 +127,20 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
+             itemstack.damage(1, entityhuman, (entityhuman1) -> {
+                 entityhuman1.d(enumhand);
+             });
 +
 +            // Purpur start
 +            EntityItem pumpkin = new EntityItem(world, locX, locY, locZ, new ItemStack(Blocks.PUMPKIN.getItem()));
@@ -47,7 +46,6 @@ index b5c2fd92..7518d997 100644
 +                }
 +                return true;
 +            }
-+            // Purpur end
          }
  
          return super.a(entityhuman, enumhand);

patches/server/0007-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 9b22151ca279174b771b39bf13bea6f2422c9700 Mon Sep 17 00:00:00 2001
+From 9fb9afd68241fd01be4dfdf00f0211294b8471d6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:45 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -12,24 +12,24 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
  5 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index dd827aea..053a880c 100644
+index d9e5eaad1..bcbade19e 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-@@ -7,6 +7,9 @@ public class EntityGiantZombie extends EntityMonster {
-     public EntityGiantZombie(World world) {
-         super(EntityTypes.GIANT, world);
-         this.setSize(this.width * 6.0F, this.length * 6.0F);
+@@ -4,6 +4,9 @@ public class EntityGiantZombie extends EntityMonster {
+ 
+     public EntityGiantZombie(EntityTypes<? extends EntityGiantZombie> entitytypes, World world) {
+         super(entitytypes, world);
 +        // Purpur start
 +        this.safeFallDistance = 10.0F;
 +        // Purpur end
      }
  
-     public float getHeadHeight() {
+     @Override
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 95327763..e211b95c 100644
+index 8ce2fca80..686bca4f2 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-@@ -181,7 +181,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
+@@ -179,7 +179,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
              this.a(SoundEffects.ENTITY_HORSE_LAND, 0.4F, 1.0F);
          }
  
@@ -39,7 +39,7 @@ index 95327763..e211b95c 100644
          if (i > 0) {
              this.damageEntity(DamageSource.FALL, (float) i);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4d5459d2..13a3bd02 100644
+index dacaa16e0..488ecbaa9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -50,8 +50,8 @@ index 4d5459d2..13a3bd02 100644
      boolean forceDrops;
      ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
      public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -1368,7 +1369,7 @@ public abstract class EntityLiving extends Entity {
-         super.c(f, f1);
+@@ -1522,7 +1523,7 @@ public abstract class EntityLiving extends Entity {
+         super.b(f, f1);
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
 -        int i = MathHelper.f((f - 3.0F - f2) * f1);
@@ -60,23 +60,23 @@ index 4d5459d2..13a3bd02 100644
          if (i > 0) {
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 82a32c61..5e752b0c 100644
+index 6404b32b2..f8a8da637 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
-@@ -318,7 +318,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
-     }
+@@ -344,7 +344,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
  
-     public void c(float f, float f1) {
+     @Override
+     public void b(float f, float f1) {
 -        int i = MathHelper.f((f * 0.5F - 3.0F) * f1);
 +        int i = MathHelper.f((f * 0.5F - this.safeFallDistance) * f1); // Purpur
  
          if (i > 0) {
              if (f >= 6.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d6a4bc64..89a49f03 100644
+index b85385ba4..640faccfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -633,4 +633,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -686,4 +686,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().isHandRaised();
      }
      // Paper end

scripts/upstream.sh

@@ -11,7 +11,7 @@ done
 if [[ "$1" == up* ]]; then
 	(
 		cd "$basedir/Paper/"
-		git fetch && git reset --hard origin/master
+		git fetch && git reset --hard origin/ver/1.14-pre5
 		cd ../
 		git add Paper
 	)