Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-API-Patches/0020-Complete-resource-pack-API.patch
View File

@@ -1,14 +1,14 @@
From c9dd0e23a824050ebaecbfc09332e663b89d438e Mon Sep 17 00:00:00 2001
From bb7b7a5e39dd260604c73a219f275c3982f012a3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 22:59:54 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2096656ee..a9163a5f6 100644
index 5109a0c3..96d97bf3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1228,7 +1228,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1204,7 +1204,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 2096656ee..a9163a5f6 100644
public void setResourcePack(String url);
/**
@@ -1649,6 +1651,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1625,6 +1627,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setViewDistance(int viewDistance);
@@ -80,7 +80,7 @@ index 2096656ee..a9163a5f6 100644
public class Spigot extends Entity.Spigot
{
diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
index 4c498016f..aa18a7667 100644
index 4c498016..aa18a766 100644
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -10,13 +10,32 @@ import org.bukkit.event.HandlerList;
@@ -117,5 +117,5 @@ index 4c498016f..aa18a7667 100644
* Gets the status of this pack.
*
--
2.19.1
2.20.1