Merge in Tuinity patches

patches/api/0021-Add-API-for-Villager-resetOffers.patch

@@ -1,30 +0,0 @@
-From c4edd7018545faf35f370d4e8fe4f08ecb2baced Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 7 Oct 2019 00:15:28 -0500
-Subject: [PATCH] Add API for Villager#resetOffers()
-
----
- src/main/java/org/bukkit/entity/Villager.java | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index ef48ad9b2..2bb9f768b 100644
---- a/src/main/java/org/bukkit/entity/Villager.java
-+++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -96,6 +96,13 @@ public interface Villager extends AbstractVillager {
-      */
-     public void wakeup();
- 
-+    // Purpur start
-+    /**
-+     * Reset this villager's trade offers
-+     */
-+    public void resetOffers();
-+    // Purpur end
-+
-     /**
-      * Represents Villager type, usually corresponding to what biome they spawn
-      * in.
--- 
-2.24.0
-