From 828d600143c982d7928f712b10118c2cae528d81 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 14 May 2017 08:46:44 -0500 Subject: [PATCH] Update API patches to MC 1.12pre2 --- Spigot-API-Patches/0001-POM-changes.patch | 14 ++++---- Spigot-API-Patches/0003-Timings-v2.patch | 32 ++++++++--------- .../0004-Player-affects-spawning-API.patch | 10 +++--- .../0005-Add-getTPS-method.patch | 20 +++++------ .../0010-Add-player-view-distance-API.patch | 8 ++--- .../0015-Expose-server-CommandMap.patch | 16 ++++----- ...cord-chat-API-from-spigot-subclasses.patch | 16 ++++----- .../0017-Player-Tab-List-and-Title-APIs.patch | 10 +++--- .../0018-Add-exception-reporting-event.patch | 34 +++++++++---------- ...t-sendMessage-methods-to-CommandSend.patch | 12 +++---- ...working-with-arrows-stuck-in-living-.patch | 8 ++--- .../0022-Complete-resource-pack-API.patch | 10 +++--- .../0023-Use-ASM-for-event-executors.patch | 24 ++++++------- ...eload-permissions.yml-and-require-co.patch | 18 +++++----- ...0-Allow-Reloading-of-Command-Aliases.patch | 14 ++++---- ...0043-Add-String-based-Action-Bar-API.patch | 14 ++++---- work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Paperclip | 2 +- work/Spigot | 2 +- 21 files changed, 135 insertions(+), 135 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 869e695736..1caedd635a 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From e9476e0764a94d5000a6add8386864f4fe8d8b88 Mon Sep 17 00:00:00 2001 +From fb47b4cfb2bfb00c13f0555b516be68a789659f6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 28d2a57..0b6fd28 100644 +index e7891169..067d30e8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ @@ -24,7 +24,7 @@ index 28d2a57..0b6fd28 100644 - spigot-api + com.destroystokyo.paper + paper-api - 1.11.2-R0.1-SNAPSHOT + 1.12-pre2-SNAPSHOT jar - Spigot-API @@ -87,7 +87,7 @@ index 28d2a57..0b6fd28 100644 com.google.guava -@@ -108,6 +124,7 @@ +@@ -102,6 +118,7 @@ @@ -95,7 +95,7 @@ index 28d2a57..0b6fd28 100644 org.apache.maven.plugins -@@ -130,26 +147,6 @@ +@@ -124,26 +141,6 @@ @@ -122,7 +122,7 @@ index 28d2a57..0b6fd28 100644 org.apache.maven.plugins maven-shade-plugin 2.4.3 -@@ -162,8 +159,7 @@ +@@ -156,8 +153,7 @@ @@ -133,5 +133,5 @@ index 28d2a57..0b6fd28 100644 true -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 26a6c433d6..b73397a7db 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From ecdb1d39c4e927e1084293c7d1a90a3eec22a1ea Mon Sep 17 00:00:00 2001 +From 260383c321c8e1b9a321cdfff94f535287739b91 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -2932,10 +2932,10 @@ 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 ab3f6c0b..e1898343 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 { +@@ -523,7 +523,6 @@ public final class Bukkit { */ public static void reload() { server.reload(); @@ -2944,10 +2944,10 @@ 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 d3fdd638..30b99241 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 { +@@ -936,12 +936,27 @@ public interface Server extends PluginMessageRecipient { public class Spigot { @@ -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 cdf838eb..39b275cb 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 { @@ -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 0794688e..517e69f8 100644 +index b57c81c1..d24ef805 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1497,6 +1497,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1507,6 +1507,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,10 +3467,10 @@ index 0794688e..517e69f8 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 e13d27d2..b43ffd36 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 { +@@ -292,7 +292,6 @@ public final class SimplePluginManager implements PluginManager { } } @@ -3478,7 +3478,7 @@ index 10561864..4ee123e4 100644 return result.toArray(new Plugin[result.size()]); } -@@ -332,7 +331,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -329,7 +328,7 @@ public final class SimplePluginManager implements PluginManager { if (result != null) { plugins.add(result); @@ -3487,7 +3487,7 @@ index 10561864..4ee123e4 100644 } return result; -@@ -358,7 +357,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -355,7 +354,7 @@ public final class SimplePluginManager implements PluginManager { * @return Plugin if it exists, otherwise null */ public synchronized Plugin getPlugin(String name) { @@ -3496,7 +3496,7 @@ index 10561864..4ee123e4 100644 } public synchronized Plugin[] getPlugins() { -@@ -556,7 +555,8 @@ public final class SimplePluginManager implements PluginManager { +@@ -553,7 +552,8 @@ public final class SimplePluginManager implements PluginManager { throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); } @@ -3506,7 +3506,7 @@ index 10561864..4ee123e4 100644 getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); } else { getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); -@@ -717,7 +717,7 @@ public final class SimplePluginManager implements PluginManager { +@@ -714,7 +714,7 @@ public final class SimplePluginManager implements PluginManager { } public boolean useTimings() { @@ -3515,7 +3515,7 @@ index 10561864..4ee123e4 100644 } /** -@@ -726,6 +726,6 @@ public final class SimplePluginManager implements PluginManager { +@@ -723,6 +723,6 @@ public final class SimplePluginManager implements PluginManager { * @param use True if per event timing code should be used */ public void useTimings(boolean use) { @@ -3829,5 +3829,5 @@ index 8d982974..7e89b97b 100644 - } } -- -2.12.1.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index ccea4af5b9..062e764f0d 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,16 +1,16 @@ -From 1419e3a2f80a01da0b33d85c86e5f8c083b39caf Mon Sep 17 00:00:00 2001 +From 777ac30514f3a7c0fa43ab7d3a64732580a0236b Mon Sep 17 00:00:00 2001 From: Jedediah Smith 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 517e69f8..2f80d248 100644 +index d24ef805..01c61e8e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1386,6 +1386,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1396,6 +1396,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ - public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); + public AdvancementProgress getAdvancementProgress(Advancement advancement); + /** + * Get whether the player can affect mob spawning @@ -30,5 +30,5 @@ index 517e69f8..2f80d248 100644 public class Spigot extends Entity.Spigot { -- -2.12.1.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch index 3c9c4f1df0..8c9eece63a 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From 89cb7c72eef5269f43decc17a24bc748f00c8616 Mon Sep 17 00:00:00 2001 +From e3a0f7d9dce7c912c7a5b69d89673d404670c712 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7fd544e..3b16953 100644 +index e1898343..4f094f7b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1142,6 +1142,16 @@ public final class Bukkit { +@@ -1125,6 +1125,16 @@ public final class Bukkit { return server.getEntity(uuid); } @@ -23,13 +23,13 @@ index 7fd544e..3b16953 100644 + // Paper end + /** - * @see UnsafeValues - * @return the unsafe values instance + * Get the advancement specified by this key. + * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 77cfe56..a4e6894 100644 +index 30b99241..a503bb49 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -934,6 +934,15 @@ public interface Server extends PluginMessageRecipient { +@@ -919,6 +919,15 @@ public interface Server extends PluginMessageRecipient { */ Entity getEntity(UUID uuid); @@ -43,8 +43,8 @@ index 77cfe56..a4e6894 100644 + // Paper end + /** - * @see UnsafeValues - * @return the unsafe values instance + * Get the advancement specified by this key. + * -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index dfe20c43ef..152fa5ecf6 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From 2a3d777598efa11b8b38880a86e1e42fb9d5d700 Mon Sep 17 00:00:00 2001 +From f631e49d52757aad1b6341e3581887327c51aa81 Mon Sep 17 00:00:00 2001 From: Byteflux 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 2f80d248..268dc2ed 100644 +index 01c61e8e..dd9a6b2b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1400,6 +1400,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1410,6 +1410,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setAffectsSpawning(boolean affects); @@ -30,5 +30,5 @@ index 2f80d248..268dc2ed 100644 public class Spigot extends Entity.Spigot { -- -2.12.1.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch index 557e8f2e56..8e11ec8af4 100644 --- a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 37f9f5c93bf615201883c1dc2daf4575865f440e Mon Sep 17 00:00:00 2001 +From cbcb424cbb5b28efffe80c1fb6f641332954ba25 Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3b16953a..07077ec4 100644 +index 4f094f7b..5147cbda 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor; @@ -20,7 +20,7 @@ index 3b16953a..07077ec4 100644 import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; -@@ -1161,6 +1158,17 @@ public final class Bukkit { +@@ -1154,6 +1151,17 @@ public final class Bukkit { return server.getUnsafe(); } @@ -39,7 +39,7 @@ index 3b16953a..07077ec4 100644 { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a4e68943..4463ab33 100644 +index a503bb49..ed3a7197 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor; @@ -54,7 +54,7 @@ index a4e68943..4463ab33 100644 import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; -@@ -943,6 +940,14 @@ public interface Server extends PluginMessageRecipient { +@@ -928,6 +925,14 @@ public interface Server extends PluginMessageRecipient { public double[] getTPS(); // Paper end @@ -67,8 +67,8 @@ index a4e68943..4463ab33 100644 + CommandMap getCommandMap(); + /** - * @see UnsafeValues - * @return the unsafe values instance + * Get the advancement specified by this key. + * -- -2.13.0.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 9c872d12f6..277424a2a5 100644 --- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From e9c8c871a51d7563489fbdf662d5cbee08a51372 Mon Sep 17 00:00:00 2001 +From d80dbb15c8d5511bb0a05fb63f58ef9818bcf5f0 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 @@ -6,10 +6,10 @@ 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 07077ec..a2a8698 100644 +index 5147cbda..9af61bad 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 { +@@ -278,6 +278,26 @@ public final class Bukkit { return server.broadcastMessage(message); } @@ -37,10 +37,10 @@ index 07077ec..a2a8698 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 4463ab3..0cc64b7 100644 +index ed3a7197..a5750304 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 { +@@ -226,6 +226,26 @@ public interface Server extends PluginMessageRecipient { */ public int broadcastMessage(String message); @@ -68,10 +68,10 @@ index 4463ab3..0cc64b7 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 845fa88..91c46aa 100644 +index dd9a6b2b..7e3e3b7f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -391,6 +391,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -393,6 +393,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void sendMap(MapView map); @@ -109,5 +109,5 @@ index 845fa88..91c46aa 100644 * Forces an update of the player's entire inventory. * -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch index b67e669f31..f7ae630522 100644 --- a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 469214d9ec6d79d3bd1d160d51fb9658a45fa86a Mon Sep 17 00:00:00 2001 +From c2ec6e008a1a9c6ef9763c0c1ad45783b32b0e7c 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java new file mode 100644 -index 0000000..e1ecd44 +index 00000000..e1ecd447 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Title.java @@ -0,0 +1,358 @@ @@ -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 91c46aa..78218af 100644 +index 7e3e3b7f..d19a928d 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 91c46aa..78218af 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -419,6 +420,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -421,6 +422,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); } @@ -498,5 +498,5 @@ index 91c46aa..78218af 100644 /** -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch index 9db0939737..e9c394b5d3 100644 --- a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0018-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From f3ef3ba155ffb8398e2f421fb0ccb0df8b857c4e Mon Sep 17 00:00:00 2001 +From a10595b22bc0699a4ae1d75c993c30a278a1024c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:24:35 -0600 Subject: [PATCH] Add exception reporting event @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java new file mode 100644 -index 0000000..4109454 +index 00000000..4109454a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java @@ -0,0 +1,37 @@ @@ -49,7 +49,7 @@ index 0000000..4109454 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java new file mode 100644 -index 0000000..6fb39af +index 00000000..6fb39af0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java @@ -0,0 +1,64 @@ @@ -119,7 +119,7 @@ index 0000000..6fb39af +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java new file mode 100644 -index 0000000..410b241 +index 00000000..410b2413 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java @@ -0,0 +1,52 @@ @@ -177,7 +177,7 @@ index 0000000..410b241 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java new file mode 100644 -index 0000000..c06ea39 +index 00000000..c06ea394 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java @@ -0,0 +1,23 @@ @@ -206,7 +206,7 @@ index 0000000..c06ea39 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java new file mode 100644 -index 0000000..e762ed0 +index 00000000..e762ed0d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java @@ -0,0 +1,35 @@ @@ -247,7 +247,7 @@ index 0000000..e762ed0 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java new file mode 100644 -index 0000000..f016ba3 +index 00000000..f016ba3b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java @@ -0,0 +1,20 @@ @@ -274,7 +274,7 @@ index 0000000..f016ba3 \ No newline at end of file diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java new file mode 100644 -index 0000000..6defac2 +index 00000000..6defac28 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java @@ -0,0 +1,38 @@ @@ -318,7 +318,7 @@ index 0000000..6defac2 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java new file mode 100644 -index 0000000..89e1325 +index 00000000..89e13252 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java @@ -0,0 +1,64 @@ @@ -388,7 +388,7 @@ index 0000000..89e1325 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java new file mode 100644 -index 0000000..2d0b2d4 +index 00000000..2d0b2d4a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java @@ -0,0 +1,37 @@ @@ -431,7 +431,7 @@ index 0000000..2d0b2d4 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java new file mode 100644 -index 0000000..5582999 +index 00000000..5582999f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java @@ -0,0 +1,22 @@ @@ -458,7 +458,7 @@ index 0000000..5582999 + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 466757b..08976cd 100644 +index 39b275cb..6e9fc84f 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -10,6 +10,9 @@ import java.util.List; @@ -494,7 +494,7 @@ index 466757b..08976cd 100644 } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 4ee123e..1302773 100644 +index b43ffd36..d68e3bee 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -18,6 +18,9 @@ import java.util.logging.Level; @@ -507,7 +507,7 @@ index 4ee123e..1302773 100644 import org.apache.commons.lang.Validate; import org.bukkit.Server; import org.bukkit.command.Command; -@@ -403,7 +406,8 @@ public final class SimplePluginManager implements PluginManager { +@@ -400,7 +403,8 @@ public final class SimplePluginManager implements PluginManager { try { plugin.getPluginLoader().enablePlugin(plugin); } catch (Throwable ex) { @@ -517,7 +517,7 @@ index 4ee123e..1302773 100644 } HandlerList.bakeAll(); -@@ -422,36 +426,48 @@ public final class SimplePluginManager implements PluginManager { +@@ -419,36 +423,48 @@ public final class SimplePluginManager implements PluginManager { try { plugin.getPluginLoader().disablePlugin(plugin); } catch (Throwable ex) { @@ -571,7 +571,7 @@ index 4ee123e..1302773 100644 public void clearPlugins() { synchronized (this) { disablePlugins(); -@@ -513,7 +529,13 @@ public final class SimplePluginManager implements PluginManager { +@@ -510,7 +526,13 @@ public final class SimplePluginManager implements PluginManager { )); } } catch (Throwable ex) { @@ -587,5 +587,5 @@ index 4ee123e..1302773 100644 } } -- -2.9.2.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 1b4d35f189..9fa38b676b 100644 --- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From db8e2244dc858395a100b8eab73990d0f88d642f Mon Sep 17 00:00:00 2001 +From a619922d4911b32ce2aacbadd02478679af1b76e Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index 148756b..4ad0028 100644 +index 148756b9..4ad0028c 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -32,4 +32,30 @@ public interface CommandSender extends Permissible { @@ -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 78218af..46353e4 100644 +index d19a928d..54d05113 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -398,6 +398,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -400,6 +400,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param component the components to send */ @@ -51,7 +51,7 @@ index 78218af..46353e4 100644 public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) { spigot().sendMessage(component); } -@@ -407,6 +408,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -409,6 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param components the components to send */ @@ -60,5 +60,5 @@ index 78218af..46353e4 100644 spigot().sendMessage(components); } -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 7133161975..1bf4594db5 100644 --- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From 0f430fe8265660cff8b880f01a04d7b59c420cbc Mon Sep 17 00:00:00 2001 +From 303cfe3bc6d7b8af240cfde20784cbdfaee21c8e Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index a938b61..af3d1e5 100644 +index 5423af84..bbf09c75 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -428,4 +428,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -391,4 +391,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti * @return collision status */ boolean isCollidable(); @@ -29,5 +29,5 @@ index a938b61..af3d1e5 100644 + // Paper end } -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch index 8a90951471..3665d5707b 100644 --- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From c8b196c93809d7a6d76c6f2fa80dd55151ca7403 Mon Sep 17 00:00:00 2001 +From f43d3f0d7a37ca52a66b336709784c7827e402e8 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 d89cd07c..a0b95550 100644 +index 54d05113..f9d24bfd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1177,7 +1177,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1179,7 +1179,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 d89cd07c..a0b95550 100644 public void setResourcePack(String url); /** -@@ -1557,6 +1559,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1567,6 +1569,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); @@ -110,5 +110,5 @@ index 4c498016..4c838519 100644 * Gets the status of this pack. * -- -2.12.1.windows.1 +2.11.0 diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch index 97ded28e61..5a967874c6 100644 --- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 600abe27eed00e0954178da02627af00e14c9e89 Mon Sep 17 00:00:00 2001 +From 0e3da9b4f55b5b2a07c2bdb4eb6c4e500422fef4 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index a40cfb4..f5f62b4 100644 +index c7514ba9..c671cc33 100644 --- a/pom.xml +++ b/pom.xml -@@ -134,6 +134,12 @@ +@@ -128,6 +128,12 @@ 1.3 test @@ -24,7 +24,7 @@ index a40cfb4..f5f62b4 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 0000000..9ff99e3 +index 00000000..9ff99e3b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,40 @@ @@ -70,7 +70,7 @@ index 0000000..9ff99e3 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 0000000..f60f010 +index 00000000..f60f0100 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,39 @@ @@ -115,7 +115,7 @@ index 0000000..f60f010 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 0000000..140cf0a +index 00000000..140cf0ad --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,44 @@ @@ -165,7 +165,7 @@ index 0000000..140cf0a +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 0000000..6941d9f +index 00000000..6941d9fb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,32 @@ @@ -203,7 +203,7 @@ index 0000000..6941d9f +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 0000000..776a9a0 +index 00000000..776a9a03 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,62 @@ @@ -271,7 +271,7 @@ index 0000000..776a9a0 +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 0000000..62acbf8 +index 00000000..62acbf82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,33 @@ @@ -309,7 +309,7 @@ index 0000000..62acbf8 + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index 3b2c99e..f9316d6 100644 +index 3b2c99ea..f9316d65 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -4,9 +4,55 @@ import org.bukkit.event.Event; @@ -369,7 +369,7 @@ index 3b2c99e..f9316d6 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index d8b9c24..40fd71d 100644 +index d8b9c244..40fd71dc 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -287,20 +287,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -395,5 +395,5 @@ index d8b9c24..40fd71d 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.7.4 +2.11.0 diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch index 53147fdddf..59686fb88a 100644 --- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From 40236482736f3757f53df9547b7f244622c38034 Mon Sep 17 00:00:00 2001 +From ecdc6512316f64881451b0359268c276a4888615 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a2a8698..f5af400 100644 +index 9af61bad..43510bad 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1187,6 +1187,13 @@ public final class Bukkit { +@@ -1180,6 +1180,13 @@ public final class Bukkit { public static CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index a2a8698..f5af400 100644 public static Server.Spigot spigot() diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 0cc64b7..2df8324 100644 +index a5750304..8922551f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1018,4 +1018,6 @@ public interface Server extends PluginMessageRecipient { } Spigot spigot(); @@ -35,7 +35,7 @@ index 0cc64b7..2df8324 100644 + void reloadPermissions(); // Paper } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c70d512..040509c 100644 +index c70d5129..040509c1 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -11,15 +11,36 @@ public class ReloadCommand extends BukkitCommand { @@ -87,10 +87,10 @@ index c70d512..040509c 100644 + } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 1302773..9ce0a5d 100644 +index d68e3bee..7aece13e 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -750,4 +750,13 @@ public final class SimplePluginManager implements PluginManager { +@@ -747,4 +747,13 @@ public final class SimplePluginManager implements PluginManager { public void useTimings(boolean use) { co.aikar.timings.Timings.setTimingsEnabled(use); // Spigot } @@ -105,5 +105,5 @@ index 1302773..9ce0a5d 100644 + } -- -2.9.3 +2.11.0 diff --git a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch index 642909463a..eeaa0b39cf 100644 --- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 5075ebcd06026e2d2e713d47e86d4ad0ddbcbc2b Mon Sep 17 00:00:00 2001 +From 17605bbb3704c5077bcf3a12aabe346de9684f78 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f5af400d..1f663fa1 100644 +index 43510bad..76d250f7 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1194,6 +1194,13 @@ public final class Bukkit { +@@ -1187,6 +1187,13 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -24,10 +24,10 @@ index f5af400d..1f663fa1 100644 public static Server.Spigot spigot() diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 2df83245..4a90d581 100644 +index 8922551f..b04b796a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1027,4 +1027,6 @@ public interface Server extends PluginMessageRecipient { +@@ -1020,4 +1020,6 @@ public interface Server extends PluginMessageRecipient { Spigot spigot(); void reloadPermissions(); // Paper @@ -52,7 +52,7 @@ index 30d60247..d8a75607 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 08976cd4..2e232fd1 100644 +index 6e9fc84f..6f733fe0 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap { @@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644 confirmed = true; } else { -- -2.12.2 +2.11.0 diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch index 17a6adb981..975234f933 100644 --- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch @@ -1,14 +1,14 @@ -From 309d69927547f1e1da781153bd9f0b851facbe6a Mon Sep 17 00:00:00 2001 +From 4ac089216d11037b15f9defa13570faa34f88a0c Mon Sep 17 00:00:00 2001 From: Aikar 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 a0b95550..2c166a8c 100644 +index f9d24bfd..2f7c96ee 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -393,6 +393,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMap(MapView map); // Paper start @@ -35,7 +35,7 @@ index a0b95550..2c166a8c 100644 /** * Sends the component to the player * -@@ -416,9 +436,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -418,9 +438,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 a0b95550..2c166a8c 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1705,9 +1727,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1715,9 +1737,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 a0b95550..2c166a8c 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."); } -@@ -1715,9 +1739,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1725,9 +1749,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 * @@ -73,5 +73,5 @@ index a0b95550..2c166a8c 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.12.2 +2.11.0 diff --git a/work/BuildData b/work/BuildData index c7f29d0501..f4d4fd9c0f 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit c7f29d05017084c03eb1424919ba41ed622442d8 +Subproject commit f4d4fd9c0ff899191e17fb7f7a3673f5529c0e05 diff --git a/work/Bukkit b/work/Bukkit index 7450a0255b..5ad2ecf658 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 7450a0255b79a2a4675d31946ebda8716394bbed +Subproject commit 5ad2ecf658276b8aae336b0e5bfb894a5151b578 diff --git a/work/CraftBukkit b/work/CraftBukkit index 6e3cec8bc7..5195487ec6 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a +Subproject commit 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 diff --git a/work/Paperclip b/work/Paperclip index 370a5d44b6..13d77aaa27 160000 --- a/work/Paperclip +++ b/work/Paperclip @@ -1 +1 @@ -Subproject commit 370a5d44b6bc121c25e0208e127304f8dbdfed55 +Subproject commit 13d77aaa277e3fb68fc0227d52e38e9226ca30c5 diff --git a/work/Spigot b/work/Spigot index 3fb9445eca..429b0e3b08 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 3fb9445eca2b29aaae34bf5723cfd8da3fc1bf1d +Subproject commit 429b0e3b082cc23ac8c9813994c27b23262860e0