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-02-17 20:03:38 -06:00
parent f654bf8fc2
commit ae98591b8c
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
25 changed files with 165 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 4f781ea0e66da6e77e8b22812bc9f480bb17f356 Mon Sep 17 00:00:00 2001
From 6591bfa4e3eae377117aedd3105c793e13a268a9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
new file mode 100644
index 00000000..4d8b633e
index 0000000..4d8b633
--- /dev/null
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +1,82 @@
@ -94,7 +94,7 @@ index 00000000..4d8b633e
+}
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
new file mode 100644
index 00000000..8c43e206
index 0000000..8c43e20
--- /dev/null
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,61 @@
@ -161,7 +161,7 @@ index 00000000..8c43e206
+}
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
new file mode 100644
index 00000000..96057fc7
index 0000000..96057fc
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,81 @@
@ -248,7 +248,7 @@ index 00000000..96057fc7
+}
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
new file mode 100644
index 00000000..8b2d1b82
index 0000000..8b2d1b8
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,72 @@
@ -326,7 +326,7 @@ index 00000000..8b2d1b82
+}
diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
new file mode 100644
index 00000000..f222d6b7
index 0000000..f222d6b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +1,120 @@
@ -452,7 +452,7 @@ index 00000000..f222d6b7
+}
diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
new file mode 100644
index 00000000..916b6f9d
index 0000000..916b6f9
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +1,209 @@
@ -667,7 +667,7 @@ index 00000000..916b6f9d
+}
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
new file mode 100644
index 00000000..389875b3
index 0000000..389875b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,342 @@
@ -1015,7 +1015,7 @@ index 00000000..389875b3
+}
diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
new file mode 100644
index 00000000..0e114eb3
index 0000000..0e114eb
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +1,55 @@
@ -1076,7 +1076,7 @@ index 00000000..0e114eb3
+}
diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
new file mode 100644
index 00000000..623dda49
index 0000000..623dda4
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,102 @@
@ -1184,7 +1184,7 @@ index 00000000..623dda49
+}
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
new file mode 100644
index 00000000..0571c9e7
index 0000000..0571c9e
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,284 @@
@ -1474,7 +1474,7 @@ index 00000000..0571c9e7
+}
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
new file mode 100644
index 00000000..56b10e89
index 0000000..56b10e8
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +1,119 @@
@ -1599,7 +1599,7 @@ index 00000000..56b10e89
+}
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
new file mode 100644
index 00000000..df7f4259
index 0000000..df7f425
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,342 @@
@ -1947,7 +1947,7 @@ index 00000000..df7f4259
+}
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
new file mode 100644
index 00000000..58ed35e0
index 0000000..58ed35e
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,196 @@
@ -2149,7 +2149,7 @@ index 00000000..58ed35e0
+}
diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
new file mode 100644
index 00000000..e7c389c0
index 0000000..e7c389c
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +1,72 @@
@ -2227,7 +2227,7 @@ index 00000000..e7c389c0
+}
diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
new file mode 100644
index 00000000..5edaba12
index 0000000..5edaba1
--- /dev/null
+++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +1,51 @@
@ -2284,7 +2284,7 @@ index 00000000..5edaba12
+}
diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
new file mode 100644
index 00000000..5fdf7c4c
index 0000000..5fdf7c4
--- /dev/null
+++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,123 @@
@ -2413,7 +2413,7 @@ index 00000000..5fdf7c4c
+}
diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
new file mode 100644
index 00000000..79fa9d52
index 0000000..79fa9d5
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,70 @@
@ -2489,7 +2489,7 @@ index 00000000..79fa9d52
+}
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
new file mode 100644
index 00000000..a9f29199
index 0000000..a9f2919
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,332 @@
@ -2827,7 +2827,7 @@ index 00000000..a9f29199
+}
diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
new file mode 100644
index 00000000..3a288d2a
index 0000000..3a288d2
--- /dev/null
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,100 @@
@ -2932,7 +2932,7 @@ index 00000000..3a288d2a
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5b6413be..7fd544eb 100644
index 5b6413b..7fd544e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -538,7 +538,6 @@ public final class Bukkit {
@ -2944,7 +2944,7 @@ index 5b6413be..7fd544eb 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 120dba25..77cfe561 100644
index 120dba2..77cfe56 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient {
@ -2978,7 +2978,7 @@ index 120dba25..77cfe561 100644
*
diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
new file mode 100644
index 00000000..fd452bce
index 0000000..fd452bc
--- /dev/null
+++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +1,18 @@
@ -3001,7 +3001,7 @@ index 00000000..fd452bce
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 08a9739f..347d2189 100644
index 08a9739..347d218 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -32,7 +32,8 @@ public abstract class Command {
@ -3031,7 +3031,7 @@ index 08a9739f..347d2189 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 3f07d7f4..f89ad075 100644
index 3f07d7f..f89ad07 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command {
@ -3054,7 +3054,7 @@ index 3f07d7f4..f89ad075 100644
}
diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
new file mode 100644
index 00000000..66232339
index 0000000..6623233
--- /dev/null
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,99 @@
@ -3158,7 +3158,7 @@ index 00000000..66232339
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 5965514a..466757b9 100644
index 5965514..466757b 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@ -3193,7 +3193,7 @@ index 5965514a..466757b9 100644
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
deleted file mode 100644
index a8f61f2d..00000000
index a8f61f2..0000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -1,253 +0,0 @@
@ -3451,10 +3451,10 @@ index a8f61f2d..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5a2dc327..5fbad9f5 100644
index 9ce3a5e..ee88f26 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1443,6 +1443,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1491,6 +1491,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -3467,7 +3467,7 @@ index 5a2dc327..5fbad9f5 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 10561864..4ee123e4 100644
index 1056186..4ee123e 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
@ -3524,7 +3524,7 @@ index 10561864..4ee123e4 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 80c6a72e..759c4617 100644
index 80c6a72..759c461 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@ -3573,7 +3573,7 @@ index 80c6a72e..759c4617 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 4cffa137..b2cbf9e4 100644
index 4cffa13..b2cbf9e 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
@ -3587,7 +3587,7 @@ index 4cffa137..b2cbf9e4 100644
private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
private final PluginDescriptionFile description;
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
index 5ca863b3..04804706 100644
index 5ca863b..0480470 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent;
@ -3599,7 +3599,7 @@ index 5ca863b3..04804706 100644
+ public String getData(); // Spigot
+}
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
index 8d982974..7e89b97b 100644
index 8d98297..7e89b97 100644
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -1,165 +1,76 @@
@ -3829,5 +3829,5 @@ index 8d982974..7e89b97b 100644
- }
}
--
2.11.0
2.9.3

6
Spigot-API-Patches/0004-Player-affects-spawning-API.patch
View file

@ -1,14 +1,14 @@
From 080e5d215fc7add653dfa942b37b83683798f474 Mon Sep 17 00:00:00 2001
From 018db8157353aedb75b2ee059924eff54229fbaa Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5fbad9f..366d1ae 100644
index ee88f26..98d3520 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1332,6 +1332,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1380,6 +1380,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);

8
Spigot-API-Patches/0010-Add-player-view-distance-API.patch
View file

@ -1,14 +1,14 @@
From 87d8e5e8a31d66af1e7ff8eaa2655fbeed5e0f47 Mon Sep 17 00:00:00 2001
From 9c22321ff1ec4a12a4d82957cc689f8493cb99cc Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:05:37 -0600
Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 366d1ae8..6f9836cd 100644
index 98d3520..845fa88 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1346,6 +1346,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1394,6 +1394,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);
@ -30,5 +30,5 @@ index 366d1ae8..6f9836cd 100644
public class Spigot extends Entity.Spigot
{
--
2.11.0.windows.3
2.9.3

10
Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View file

@ -1,4 +1,4 @@
From ec0213d43bbad628561225629bda86b4cd9dc489 Mon Sep 17 00:00:00 2001
From e9c8c871a51d7563489fbdf662d5cbee08a51372 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 19:54:32 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
Change Javadoc to be accurate
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9b310d8..87648ae 100644
index 07077ec..a2a8698 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -293,6 +293,26 @@ public final class Bukkit {
@ -37,7 +37,7 @@ index 9b310d8..87648ae 100644
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index eea7239..915d8a5 100644
index 4463ab3..0cc64b7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -239,6 +239,26 @@ public interface Server extends PluginMessageRecipient {
@ -68,10 +68,10 @@ index eea7239..915d8a5 100644
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index ebe727a..5f74d9d 100644
index 845fa88..91c46aa 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -390,6 +390,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -391,6 +391,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void sendMap(MapView map);

6
Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,4 +1,4 @@
From fa2d6467d3483f75538099c4ce6cff68bd0a5c93 Mon Sep 17 00:00:00 2001
From 469214d9ec6d79d3bd1d160d51fb9658a45fa86a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 29 Feb 2016 20:02:40 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -369,7 +369,7 @@ index 0000000..e1ecd44
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5f74d9d..8641bb9 100644
index 91c46aa..78218af 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -380,7 +380,7 @@ index 5f74d9d..8641bb9 100644
import org.bukkit.Achievement;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
@@ -418,6 +419,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -419,6 +420,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}

8
Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
View file

@ -1,4 +1,4 @@
From f48b3a42b4d30b888395ba3c184dcd9cf7cfd55c Mon Sep 17 00:00:00 2001
From db8e2244dc858395a100b8eab73990d0f88d642f Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 13:05:59 -0800
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@ -40,10 +40,10 @@ index 148756b..4ad0028 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8641bb9..0a11a51 100644
index 78218af..46353e4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -397,6 +397,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -398,6 +398,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*
* @param component the components to send
*/
@ -51,7 +51,7 @@ index 8641bb9..0a11a51 100644
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
spigot().sendMessage(component);
}
@@ -406,6 +407,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -407,6 +408,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*
* @param components the components to send
*/

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

@ -1,14 +1,14 @@
From 4f89f8b6c53cce94668af8f2b14a5378c72af8d4 Mon Sep 17 00:00:00 2001
From 80c9067e28d8125c8fb63cf7442b3c2965ff29ea 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 4b10b63..360da61 100644
index 46353e4..08a05f5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1160,7 +1160,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1171,7 +1171,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 4b10b63..360da61 100644
public void setResourcePack(String url);
/**
@@ -1503,6 +1505,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1551,6 +1553,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);

12
Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
View file

@ -1,14 +1,14 @@
From 35949ac22a7da304864f0d3cfdb3fbb3331dbe4d Mon Sep 17 00:00:00 2001
From e4ec5de4fd5d705722e0927a63201271ace12877 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 360da61..daab479 100644
index 08a05f5..29a8ec0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -392,6 +392,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -393,6 +393,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMap(MapView map);
// Paper start
@ -35,7 +35,7 @@ index 360da61..daab479 100644
/**
* Sends the component to the player
*
@@ -415,9 +435,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -416,9 +436,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends an array of components as a single message to the specified screen position of this player
*
@ -47,7 +47,7 @@ index 360da61..daab479 100644
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1651,9 +1673,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1699,9 +1721,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends the component to the specified screen position of this player
*
@ -59,7 +59,7 @@ index 360da61..daab479 100644
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1661,9 +1685,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1709,9 +1733,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends an array of components as a single message to the specified screen position of this player
*