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

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2017-03-31 23:24:42 -05:00
parent e6a7d357ce
commit e4a071f6e4
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 117 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 80c9067e28d8125c8fb63cf7442b3c2965ff29ea Mon Sep 17 00:00:00 2001
From c8b196c93809d7a6d76c6f2fa80dd55151ca7403 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 46353e4..08a05f5 100644
index d89cd07c..a0b95550 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1171,7 +1171,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1177,7 +1177,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 46353e4..08a05f5 100644
public void setResourcePack(String url);
/**
@@ -1551,6 +1553,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1557,6 +1559,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);
@ -77,7 +77,7 @@ index 46353e4..08a05f5 100644
public class Spigot extends Entity.Spigot
{
diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
index 4c49801..4c83851 100644
index 4c498016..4c838519 100644
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -10,13 +10,28 @@ import org.bukkit.event.HandlerList;
@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
* Gets the status of this pack.
*
--
2.9.3
2.12.1.windows.1