Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI
0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work
bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
This commit is contained in:
Spottedleaf 2019-06-06 08:36:57 -07:00 committed by Shane Freeder
parent 4ff5387091
commit 2f782a6652
583 changed files with 1650 additions and 1650 deletions

View file

@ -1,11 +1,11 @@
From 4fe67c4add046aa9e0f5a4b7f41b96f5061c5d61 Mon Sep 17 00:00:00 2001
From 8940e7d1f71a344b76954326e6836a9882f943cf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
index 8feb6698..d51d2ec1 100644
index 8feb6698f..d51d2ec1d 100644
--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
@@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable