mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB

Browse source 
Closes GH-569
This commit is contained in:
Zach Brown 2017-01-06 15:45:59 -06:00
parent 849653ebac
commit 63130fd2aa
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
140 changed files with 381 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0022-Complete-resource-pack-API.patch
View file

@ -1,14 +1,14 @@
From 5865959ee46d30a03b7961c997a06ca7f0d022f8 Mon Sep 17 00:00:00 2001
From 4f89f8b6c53cce94668af8f2b14a5378c72af8d4 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 0a11a51..083e60f 100644
index 4b10b63..360da61 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1172,7 +1172,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1160,7 +1160,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @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 0a11a51..083e60f 100644
public void setResourcePack(String url);
/**
@@ -1515,6 +1517,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1503,6 +1505,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);