Updated Upstream (Bukkit/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

Bukkit Changes:
6ffe5a68 Add RecipeChoice.ExactChoice API for NBT matches on ingredients
ffccf6b7 SPIGOT-4560: Add HumanEntity.sleep and related APIs

CraftBukkit Changes:
917411fd Remove redundant BlockPosition creation from sleep API
756c38d1 Add RecipeChoice.ExactChoice API for NBT matches on ingredients
8e65d8df SPIGOT-4560: Add HumanEntity.sleep and related APIs
a8382862 SPIGOT-4562: reducedDebugInfo not updated on world change
This commit is contained in:
Shane Freeder
2019-01-02 18:10:14 +00:00
parent 5d5e0ad75c
commit ccbeb5c4ed
38 changed files with 225 additions and 225 deletions

View File

@@ -1,14 +1,14 @@
From 08ca43a01ec41fc1f62acc5ee776299736289727 Mon Sep 17 00:00:00 2001
From 7ca40bb76fccf892bb8ead4ba9433e5914e8d693 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0993f31b1..a631529df 100644
index 75f21146..694254f1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1468,6 +1468,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1444,6 +1444,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public String getLocale();
@@ -32,5 +32,5 @@ index 0993f31b1..a631529df 100644
* Update the list of commands sent to the client.
* <br>
--
2.19.1
2.20.1