Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
9d0221aa API to get client side view distance.
9be7f0ea SPIGOT-4395: Additions to PlayerBedEnterEvent.
01e534c6 Minor cosmetic cleanups to imports etc

CraftBukkit Changes:
96c461b3 API to get client side view distance.
e2785f4e Remove note about development build
a8000588 SPIGOT-4395: Additions to PlayerBedEnterEvent.

Spigot Changes:
117d4f7e Rebuild patches
This commit is contained in:
Shane Freeder
2018-11-03 00:23:27 +00:00
parent 6c2709118f
commit 1e39773b53
68 changed files with 465 additions and 470 deletions

View File

@@ -1,14 +1,14 @@
From 5ac595ea87b0142696e012f6ee13638ebda9ac26 Mon Sep 17 00:00:00 2001
From 7d5bb565021f2fe65c31e71f849bdf882a0d72a4 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 f22f6a881..972adf9cb 100644
index d6ad55468..9011c690d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1243,7 +1243,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1242,7 +1242,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 f22f6a881..972adf9cb 100644
public void setResourcePack(String url);
/**
@@ -1654,6 +1656,60 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1665,6 +1667,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setViewDistance(int viewDistance);