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 4d9a417496995c21613e5e027553b0354bf120a5 Mon Sep 17 00:00:00 2001
From 2836ae3e527f34338cdfeabdafb8c4ac96b86a21 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:08:14 +0200
Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 83a8f083a..4c67f071b 100644
index 10c91699c1..09e6abdae2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1107,6 +1107,15 @@ public class CraftWorld implements World {