Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
821ce25d9 Significantly improve performance of the end generation
2b2e4fd65 Add Wandering Trader spawn rate config options
7263cbca7 [CI-SKIP] [Auto] Rebuild Patches
1c63aff6d Villager resetOffers API
8d8d74a5f Patch 2 references an invalid variable
e6d7bdca1 [CI-SKIP] fixed sed -i for bsd sed (#4782)
7ae47d4eb [CI-SKIP] Remove Waving banner fix (#4786)

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

@@ -1,18 +0,0 @@
-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 e7759f248..2c908a604 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);