Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
60135676 [Auto] Updated Upstream (CraftBukkit)
fa90052a Fix MC-125757 (#3859)
071c08d7 Only convert lore lines that actually look legacy
8c4787e3 Misc Improvements to Async Teleporting and Light patch
6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)

patches/server/0085-Add-obfhelpers-for-plugin-use.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Wed, 1 Jan 2020 20:12:39 -0600
+Subject: [PATCH] Add obfhelpers for plugin use
+
+
+diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
+index 092b4d3c2..c246942ce 100644
+--- a/src/main/java/net/minecraft/server/ItemStack.java
++++ b/src/main/java/net/minecraft/server/ItemStack.java
+@@ -644,6 +644,7 @@ public final class ItemStack {
+         return this.tag;
+     }
+ 
++    public NBTTagCompound getOrCreateSubTag(String s) { return a(s); } // Purpur - OBFHELPER
+     public NBTTagCompound a(String s) {
+         if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
+             return this.tag.getCompound(s);