Update upstream B/CB

This commit is contained in:
Zach Brown 2016-12-16 15:00:16 -06:00
parent f087ac45e3
commit 1d8b7e2ecc
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
12 changed files with 37 additions and 46 deletions

View file

@ -1,11 +1,11 @@
From 0ad996239d917bd7aa348a18cf373706991644e1 Mon Sep 17 00:00:00 2001
From 699be1d39a7401d680acf2d47ab0defa3c33a536 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 5b7ca6a..ac58f3a 100644
index 1fe4794..bf4c31b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -18,7 +18,7 @@ index 5b7ca6a..ac58f3a 100644
public void setResourcePack(String url);
/**
@@ -1494,6 +1496,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1509,6 +1511,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);
@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
* Gets the status of this pack.
*
--
2.10.2
2.9.3