Update Upstream

This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions

View file

@ -1,14 +1,14 @@
From 88916b54a083813d0732f1c63461a5eca90a93e5 Mon Sep 17 00:00:00 2001
From 2cfeb5e9e7efd65ad45b6155ce03e34197a25370 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 1de43bd3..c237073a 100644
index abe00d72..eb2e392d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1212,7 +1212,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1213,7 +1213,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 1de43bd3..c237073a 100644
public void setResourcePack(@NotNull String url);
/**
@@ -1637,6 +1639,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setViewDistance(int viewDistance);