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

Fix compilation

Browse source
This commit is contained in:
Shane Freeder 2019-05-22 05:14:56 +01:00
parent 08aaab0105
commit d9ad4e8bd8
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
39 changed files with 207 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 2cfeb5e9e7efd65ad45b6155ce03e34197a25370 Mon Sep 17 00:00:00 2001
From bd0e6228f445ce1b3e6dde9cba621e132eb3b4d2 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 abe00d72..eb2e392d 100644
index 0f7f25eb4..07ed02e8f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1213,7 +1213,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -18,7 +18,7 @@ index abe00d72..eb2e392d 100644
public void setResourcePack(@NotNull String url);
/**
@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1644,6 +1646,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setViewDistance(int viewDistance);
@ -82,7 +82,7 @@ index abe00d72..eb2e392d 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 b9819565..4c2102a1 100644
index b98195650..4c2102a11 100644
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;