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:
parent
5d5e0ad75c
commit
ccbeb5c4ed
38 changed files with 225 additions and 225 deletions
|
@ -1,4 +1,4 @@
|
|||
From af0861873204100e974bd6b187f72c398de472c9 Mon Sep 17 00:00:00 2001
|
||||
From c06616f07f969d2090db6ea62443e683748d7f73 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 18 Mar 2018 12:28:55 -0400
|
||||
Subject: [PATCH] Player.setPlayerProfile API
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
|
|||
This can be useful for changing name or skins after a player has logged in.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 5f3e085e..1e349066 100644
|
||||
index c273b9dc..5dc04f47 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -3,6 +3,7 @@ package org.bukkit.entity;
|
||||
|
@ -17,7 +17,7 @@ index 5f3e085e..1e349066 100644
|
|||
import org.bukkit.Achievement;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Effect;
|
||||
@@ -1756,6 +1757,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
@@ -1732,6 +1733,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
|
||||
*/
|
||||
boolean hasResourcePack();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue