diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 79918aaff7..68abf1ce99 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 82c13b6bbafe66e4864f1e9fae3669d7126c151f Mon Sep 17 00:00:00 2001 +From 53a0a166edaf7f461b7da11e6a049283d7ef4cc4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3529,10 +3529,10 @@ index bba914d7f..000000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aa0c80f5e..adde0f97a 100644 +index 9252d4afa..067e217ea 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1590,6 +1590,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1580,6 +1580,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."); } diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index e7a90d1412..83a8d0f7c4 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From 296c7091b124a5fdcea5f1153720a11ab318a077 Mon Sep 17 00:00:00 2001 +From 495d39a106804807258ae2f6782d58da9b5f86fc 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 adde0f97a..f5c332fc3 100644 +index 067e217ea..c062e5dc1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1483,6 +1483,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1473,6 +1473,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public String getLocale(); diff --git a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch index 8f1054ab50..139f83748a 100644 --- a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From 4901e54bf3f410c59acd9570473d5f171bffac1b Mon Sep 17 00:00:00 2001 +From fd03948745cf5823135697e592518069871c061b 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 f5c332fc3..e5e611201 100644 +index c062e5dc1..ee5c8ece2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1507,6 +1507,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1497,6 +1497,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void updateCommands(); diff --git a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 0b0c2a46e4..37d27e244a 100644 --- a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From 2db0dd58deef0d809785c129438ddc919ecf0d7d Mon Sep 17 00:00:00 2001 +From 22f7ed80cfd47412a215facc5aa618f451d19692 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 @@ -68,10 +68,10 @@ index c23ae761e..4f9dd992a 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 e5e611201..45e9484dc 100644 +index ee5c8ece2..17f69f028 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -439,6 +439,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -429,6 +429,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void sendMap(MapView map); diff --git a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch index 5d6ac5a761..18e46e88e9 100644 --- a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From f0fab740aa65fbe92940c35c3839ef276ca8da8a Mon Sep 17 00:00:00 2001 +From 53eebe4bef4140a3774f3f7b6033f0ff87595848 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 000000000..3c2b63db4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 0b14317e3..e042098df 100644 +index 17f69f028..a84c6991e 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 0b14317e3..e042098df 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -467,6 +468,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -457,6 +458,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); } diff --git a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 9f13e0cbc3..164d4b3de0 100644 --- a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,4 +1,4 @@ -From bb93ce5965c54e88bc4fe08927346a6e75ebff17 Mon Sep 17 00:00:00 2001 +From 74ed2b2b57a6ce4a0c9b62d594d8b27035b2e2ab 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 @@ -40,10 +40,10 @@ index abf68a2c7..fcb03b830 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e042098df..94b316a20 100644 +index a84c6991e..f22f6a881 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -446,6 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -436,6 +436,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param component the components to send */ @@ -51,7 +51,7 @@ index e042098df..94b316a20 100644 public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) { spigot().sendMessage(component); } -@@ -455,6 +456,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -445,6 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * @param components the components to send */ diff --git a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 3a2528c32b..c80c6eea37 100644 --- a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,14 +1,14 @@ -From f912ec5fe389be95c107a38794a22f0544bd5e1e Mon Sep 17 00:00:00 2001 +From 02510a57a8684efe916a9af81a503ffb5d67cf69 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 9e05f9138..3309053ac 100644 +index 6a5de671d..b4f519c68 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -385,4 +385,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -383,4 +383,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti * @return collision status */ boolean isCollidable(); diff --git a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch index c533ce8cf4..83ad5ccbf8 100644 --- a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0020-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From 36b15518029a0b15a750996cf6d1505f46ee6653 Mon Sep 17 00:00:00 2001 +From f9399b2efc351df5f08d0b10387870c05030b2ef 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 d4af03961..18f8a22e3 100644 +index f22f6a881..d810286d3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1253,7 +1253,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1243,7 +1243,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 d4af03961..18f8a22e3 100644 public void setResourcePack(String url); /** -@@ -1664,6 +1666,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); diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch index a9599876f3..0f0abae39c 100644 --- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch @@ -1,14 +1,14 @@ -From 371b8b5debf77d56a5d62e3b4eb1b5c47eb87250 Mon Sep 17 00:00:00 2001 +From 1a971f56c0bb5fd6dec6ecddeb15e63db5e2cf64 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 18f8a22e3..f2a148b2c 100644 +index d810286d3..993537141 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -441,6 +441,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -431,6 +431,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMap(MapView map); // Paper start @@ -35,7 +35,7 @@ index 18f8a22e3..f2a148b2c 100644 /** * Sends the component to the player * -@@ -464,9 +484,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -454,9 +474,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 18f8a22e3..f2a148b2c 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1800,9 +1822,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1790,9 +1812,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 18f8a22e3..f2a148b2c 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."); } -@@ -1810,9 +1834,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1800,9 +1824,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 * diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch index 380a551946..88930e5968 100644 --- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From 0cb60a4b2ab885ff8d88c19d7e0d3ce6200d51d3 Mon Sep 17 00:00:00 2001 +From ded2584ff9e9b1fdff41589c08a604d9ab0e9b80 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors @@ -21,7 +21,7 @@ index 43239f844..fe8d34685 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e2559c024..9f3d805c2 100644 +index 82c435207..56dee7aa2 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1341,6 +1341,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -124,10 +124,10 @@ index cfce8fa57..8660070bb 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f2a148b2c..b63e3352f 100644 +index 993537141..e848ab5b6 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -456,7 +456,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -446,7 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * * Use supplied alternative character to the section symbol to represent legacy color codes. * @@ -136,7 +136,7 @@ index f2a148b2c..b63e3352f 100644 * @param message The message to send */ public void sendActionBar(char alternateChar, String message); -@@ -523,6 +523,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -513,6 +513,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Update the subtitle of titles displayed to the player * @@ -144,7 +144,7 @@ index f2a148b2c..b63e3352f 100644 * @deprecated Use {@link #updateTitle(Title)} */ @Deprecated -@@ -531,6 +532,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -521,6 +522,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Update the subtitle of titles displayed to the player * @@ -152,7 +152,7 @@ index f2a148b2c..b63e3352f 100644 * @deprecated Use {@link #updateTitle(Title)} */ @Deprecated -@@ -539,6 +541,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -529,6 +531,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Show the given title to the player, along with the last subtitle set, using the last set times * @@ -160,7 +160,7 @@ index f2a148b2c..b63e3352f 100644 * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)} */ @Deprecated -@@ -547,6 +550,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -537,6 +540,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Show the given title to the player, along with the last subtitle set, using the last set times * @@ -168,7 +168,7 @@ index f2a148b2c..b63e3352f 100644 * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)} */ @Deprecated -@@ -1467,6 +1471,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1457,6 +1461,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -176,7 +176,7 @@ index f2a148b2c..b63e3352f 100644 */ public void spawnParticle(Particle particle, Location location, int count, T data); -@@ -1482,6 +1487,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1472,6 +1477,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -184,7 +184,7 @@ index f2a148b2c..b63e3352f 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, T data); -@@ -1531,6 +1537,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1521,6 +1527,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -192,7 +192,7 @@ index f2a148b2c..b63e3352f 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1550,6 +1557,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1540,6 +1547,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -200,7 +200,7 @@ index f2a148b2c..b63e3352f 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1605,6 +1613,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1595,6 +1603,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -208,7 +208,7 @@ index f2a148b2c..b63e3352f 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); -@@ -1626,6 +1635,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1616,6 +1625,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} diff --git a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch index 2f5fd902ab..81c48b95ea 100644 --- a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From cff523453dbefafaa591ff7ba1567e5f27317670 Mon Sep 17 00:00:00 2001 +From 94d01f18abd3ce6e565c4165501d4f870372a909 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,10 +10,10 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 17c74f0ce..15bcb2929 100644 +index 2e71054d6..fd359fe0b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -963,12 +963,33 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -953,12 +953,33 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void resetPlayerWeather(); diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch index d5273b468d..4d20eaf1fb 100644 --- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 514e2e4c93bae5fd8e5a2960a969c8bb1425f8a7 Mon Sep 17 00:00:00 2001 +From c6ea6282923143d14955acb918df8e32604ae3e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c7d322e6a..546c022bb 100644 +index fd359fe0b..4020cee58 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -17,7 +17,7 @@ index c7d322e6a..546c022bb 100644 import org.bukkit.Achievement; import org.bukkit.ChatColor; import org.bukkit.Effect; -@@ -1768,6 +1769,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1758,6 +1759,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} */ boolean hasResourcePack(); diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch index 8a10d3b0dc..d4f2470e31 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 8d9a2fefb26d0208ca820caa8277d80ce3637b98 Mon Sep 17 00:00:00 2001 +From b62098168d7c8280b83549b64b31aa2071042200 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -69,7 +69,7 @@ index 3ab2e4c7b..8daf2ddc7 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d68fd9a2b..c8d309c77 100644 +index 4020cee58..6da68835d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,10 +1,14 @@ @@ -87,7 +87,7 @@ index d68fd9a2b..c8d309c77 100644 import org.bukkit.ChatColor; import org.bukkit.Effect; import org.bukkit.GameMode; -@@ -442,6 +446,139 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -432,6 +436,139 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMap(MapView map); // Paper start diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch index a03e8cf2d6..4e506169d7 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,14 +1,14 @@ -From 2b271de495531cdde7b4cdfa4ad11470e9f749a7 Mon Sep 17 00:00:00 2001 +From 30af6dcd81dc8b15be9306fe0bc16f3fe39203f7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4acd568d0..932cc249a 100644 +index d699a8e18..dfb3f484f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -410,5 +410,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -408,5 +408,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti * @param arrows Number of arrows to stick in this entity */ void setArrowsStuck(int arrows); diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch index c79becc732..cdfae3c570 100644 --- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From eb524154c7e3ef486d64f2b1f84ab77b4a6c00fb Mon Sep 17 00:00:00 2001 +From 8ec6c2fa48cbf638a5d27edb47d12c1442d24992 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 932cc249a..41619f09a 100644 +index dfb3f484f..ac5bd8a57 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -10,6 +10,7 @@ import org.bukkit.Material; @@ -17,7 +17,7 @@ index 932cc249a..41619f09a 100644 import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.projectiles.ProjectileSource; -@@ -424,5 +425,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -422,5 +423,31 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti * @param delay Delay in ticks */ void setShieldBlockingDelay(int delay); diff --git a/work/Bukkit b/work/Bukkit index 9736896362..aa81efb023 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 9736896362b5ff5e6d79f3201983b9b3c2ddda26 +Subproject commit aa81efb023ccfef19448cc3d954e3602f64e9c6d