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

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2017-05-27 23:25:17 -05:00
parent 9d6bb9d4c8
commit 066f383b95
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
29 changed files with 140 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 82ad6d3aa0c24c2bc3fe2bb0e91f49f156d297bf Mon Sep 17 00:00:00 2001
From 30c7e1eb9b2001b9dbe9ee911896660c67b63eda 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 2c8b46cc..481c39a6 100644
index 1fc83b57..f04e2541 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1185,7 +1185,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -18,7 +18,7 @@ index 2c8b46cc..481c39a6 100644
public void setResourcePack(String url);
/**
@@ -1573,6 +1575,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1586,6 +1588,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);