diff --git a/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 24a1137e87..46f79082b9 100644 --- a/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From ab8308a04ebe3b5e2ff0a93c1527b335a3d5f3a7 Mon Sep 17 00:00:00 2001 +From fa2a28d2fc072ee99ab42c2539338c9338ad940a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -63,10 +63,10 @@ index a1ce356..91bde81 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 66527ce..edf35f5 100644 +index e13ca66..c19bb76 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -331,6 +331,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -331,6 +331,30 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void sendMap(MapView map); @@ -84,6 +84,14 @@ index 66527ce..edf35f5 100644 + * @param components the components to send + */ + public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components); ++ ++ /** ++ * Sends an array of components as a single message to the specified screen position of this player ++ * ++ * @param position the screen position ++ * @param components the components to send ++ */ ++ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components); + // Paper end + /** diff --git a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch index 464543e540..5299ea99cd 100644 --- a/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0018-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From a0fabc2ea5c62e58d9c7caef415eabe3de6c9fb8 Mon Sep 17 00:00:00 2001 +From 63efc00ce7fa0aea2762f201750d1aa1d88ddb34 Mon Sep 17 00:00:00 2001 From: Techcable 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 edf35f5..5326ea6 100644 +index c19bb76..eb357e8 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,10 +380,10 @@ index edf35f5..5326ea6 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -345,6 +346,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -353,6 +354,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param components the components to send */ - public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components); + public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components); + + /** + * Set the text displayed in the player list header and footer for this player @@ -497,7 +497,7 @@ index edf35f5..5326ea6 100644 // Paper end /** -@@ -1089,7 +1200,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1097,7 +1208,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * Resets the title displayed to the player. * @deprecated API subject to change. */ diff --git a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch b/Spigot-API-Patches/0023-Complete-resource-pack-API.patch index 8eed7d6b10..356ed1df00 100644 --- a/Spigot-API-Patches/0023-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0023-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From 7b4059b9b56f49f1a227fb39b1ea909245a1203d Mon Sep 17 00:00:00 2001 +From c5ee29107fa2ca951596709eb6c5ff26a341f024 Mon Sep 17 00:00:00 2001 From: Jedediah Smith 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 2951b98..d7c8069 100644 +index 07d8c77..d636c63 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1099,7 +1099,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1107,7 +1107,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 2951b98..d7c8069 100644 public void setResourcePack(String url); /** -@@ -1427,6 +1429,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1435,6 +1437,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); diff --git a/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 964bab156a..b781b4e096 100644 --- a/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,30 +1,26 @@ -From 90a8ebf1d6322be8e53bd6a8f517a57e23e29d2b Mon Sep 17 00:00:00 2001 +From 5ed9efdda2a3086f7529b0b0eb9df4aeff1fdeed Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 02:21:58 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 794a2c9..53bfbc4 100644 +index 794a2c9..b6be0d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1313,6 +1313,22 @@ public final class CraftServer implements Server { +@@ -1313,6 +1313,18 @@ public final class CraftServer implements Server { return count; } + // Paper start + @Override + public void broadcast(BaseComponent component) { -+ for (Player player : getOnlinePlayers()) { -+ player.sendMessage(component); -+ } ++ this.spigot.broadcast(component); + } + + @Override + public void broadcast(BaseComponent... components) { -+ for (Player player : getOnlinePlayers()) { -+ player.sendMessage(components); -+ } ++ this.spigot.broadcast(components); + } + // Paper end + @@ -32,26 +28,27 @@ index 794a2c9..53bfbc4 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8e94ddd..f5a48f9 100644 +index 202085b..7e70c71 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -156,6 +156,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } } + // Paper start + @Override + public void sendMessage(BaseComponent component) { -+ sendMessage(new BaseComponent[]{component}); ++ this.spigot.sendMessage(component); + } + + @Override + public void sendMessage(BaseComponent... components) { -+ if (getHandle().playerConnection == null) return; ++ this.spigot.sendMessage(components); ++ } + -+ PacketPlayOutChat packet = new PacketPlayOutChat(); -+ packet.components = components; -+ getHandle().playerConnection.sendPacket(packet); ++ @Override ++ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) { ++ this.spigot.sendMessage(position, components); + } + // Paper end + diff --git a/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch index bf305df0ad..cb6529cb70 100644 --- a/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 5002ff27721abc44afe0cf1616fcc29dd48897b4 Mon Sep 17 00:00:00 2001 +From 758ec740cf5321bae414b79cec8b3c32000be1eb Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -78,7 +78,7 @@ index 2286c9e..169a03c 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f5a48f9..609f7ea 100644 +index 7e70c71..a2459da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -88,9 +88,9 @@ index f5a48f9..609f7ea 100644 import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.mojang.authlib.GameProfile; -@@ -170,6 +171,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - packet.components = components; - getHandle().playerConnection.sendPacket(packet); +@@ -171,6 +172,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) { + this.spigot.sendMessage(position, components); } + + @Override diff --git a/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch index 60e6d393dc..6b321626fb 100644 --- a/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From 1229f0d2029b9c393be5b101cd3ee8c3e5951899 Mon Sep 17 00:00:00 2001 +From d159723b249d0e0adefa9711eb5e6b96fcf8edf2 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -25,10 +25,10 @@ index f1ffe7b..c6f12a1 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 609f7ea..2f86dd3 100644 +index a2459da..0f081b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -553,7 +553,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -554,7 +554,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (fromWorld == toWorld) { entity.playerConnection.teleport(to); } else { diff --git a/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch index 5397a49394..8626e7fd8f 100644 --- a/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 14d62c55a3a42150e6cba8a03c791730de3f14ad Mon Sep 17 00:00:00 2001 +From 0e87b48ebafeb6b0052653e9c685adbfbf526482 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API @@ -37,7 +37,7 @@ index 79448eb..3837f64 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f28fac0..caff497 100644 +index 0f081b5..9da0797 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -51,7 +51,7 @@ index f28fac0..caff497 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1521,6 +1525,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1522,6 +1526,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } diff --git a/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch index 96b570003e..6e66c5dfc1 100644 --- a/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From e0e3c0e65de60a9fcf351793df48a9b1fc8a5624 Mon Sep 17 00:00:00 2001 +From f16d9f3d2bd240842f3320382d4b11f5d9df0647 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8ffc06b..29244e1 100644 +index 5b91630..ab18e1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1838,4 +1838,12 @@ public final class CraftServer implements Server { +@@ -1834,4 +1834,12 @@ public final class CraftServer implements Server { { return spigot; } diff --git a/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch index fb16dd9c6d..ac6e8e1550 100644 --- a/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From 0b5910fe3ae06fd674899d2dd5a1f6b5f3aba692 Mon Sep 17 00:00:00 2001 +From 7e7eac78fd972d1a9578240ca6e5fd4f09734cec Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data @@ -44,10 +44,10 @@ index e6fb045..5ec4cd8 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a168a77..fe5084e 100644 +index 9da0797..eb88228 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1371,6 +1371,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1372,6 +1372,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void setRealHealth(double health) { diff --git a/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch b/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch index d1a933cd17..21c8c632db 100644 --- a/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch +++ b/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch @@ -1,14 +1,14 @@ -From d9b38b1ba8f921ac55766ecc47ff1cfe5a3b68c8 Mon Sep 17 00:00:00 2001 +From dc5551d29ec825888b85dbe989d28817473fc1bd Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 26 Mar 2016 18:41:22 +0100 Subject: [PATCH] Load chunk before player teleport diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fe5084e..d77211a 100644 +index eb88228..0a3dc16 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -553,6 +553,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -554,6 +554,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().closeInventory(); } diff --git a/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch index 18ccf7f7c4..37b3b73e18 100644 --- a/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch +++ b/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch @@ -1,4 +1,4 @@ -From ab9e23811fe4a0adfc0453deeadd7b59b6dd9690 Mon Sep 17 00:00:00 2001 +From cc2124afa0ca280e364f20d786d5451f1a928568 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Wed, 30 Mar 2016 01:20:11 -0500 Subject: [PATCH] Add getEntity by UUID API @@ -30,7 +30,7 @@ index 058735e..06dec17 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9ed9fbb..5b70d7a 100644 +index 281f4a4..128b597 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization; @@ -41,7 +41,7 @@ index 9ed9fbb..5b70d7a 100644 import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.generator.CraftChunkData; import org.bukkit.craftbukkit.help.SimpleHelpMap; -@@ -1853,5 +1854,14 @@ public final class CraftServer implements Server { +@@ -1849,5 +1850,14 @@ public final class CraftServer implements Server { ((SimplePluginManager) pluginManager).clearPermissions(); loadCustomPermissions(); } diff --git a/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch index 4bc3dd396c..be6d570fde 100644 --- a/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0132-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 4e8d404a04aefaad3860c588800939320f8be912 Mon Sep 17 00:00:00 2001 +From 3e584691c9aefa576fbb5d6a8241c80f65297145 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d77211a..b80474e 100644 +index 0a3dc16..4378795 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -570,6 +570,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -571,6 +571,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return true; }