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 3a982ed3a1fb226be1a1a7cc29f0aa77a91e6c8b Mon Sep 17 00:00:00 2001
From 9922d188f075c2604ee0b1ccbebba38b3c11a2ea Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9f87f333..63e48ef3 100644
index 9f87f333e..63e48ef3f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1485,6 +1485,19 @@ public final class Bukkit {
@ -29,7 +29,7 @@ index 9f87f333..63e48ef3 100644
public static Server.Spigot spigot()
{
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e1dfa92a..87300a5d 100644
index e1dfa92a9..87300a5df 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient {