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

update upstream

Browse source
This commit is contained in:
Aikar 2018-07-29 12:42:07 -04:00
parent 6d166798e6
commit 566740114e
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
79 changed files with 450 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0020-Complete-resource-pack-API.patch
View file

@ -1,14 +1,14 @@
From b2c4a432b883c52071cb4b538f1f117ea62d7a2e Mon Sep 17 00:00:00 2001
From 4fa70d57b72a112107ccde0c0c5e44368411fc2a 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 1837a14c..5638a077 100644
index 94b316a20..98744e864 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1206,7 +1206,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1253,7 +1253,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 1837a14c..5638a077 100644
public void setResourcePack(String url);
/**
@@ -1607,6 +1609,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1654,6 +1656,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);
@ -77,7 +77,7 @@ index 1837a14c..5638a077 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 4c498016..aa18a766 100644
index 4c498016f..aa18a7667 100644
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -10,13 +10,32 @@ import org.bukkit.event.HandlerList;