diff --git a/Spigot-API-Patches/0006-Entity-Origin-API.patch b/Spigot-API-Patches/0006-Entity-Origin-API.patch index 808c9e4290..8cc78b503b 100644 --- a/Spigot-API-Patches/0006-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0006-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From d79b1de71ec4b1352fe7c1c060ec3df5b79dc1f7 Mon Sep 17 00:00:00 2001 +From 37ea574289bb7d3eaae4045a22c9bbc07ecd7672 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4f5eb3676..d793de62c 100644 +index 236cddb2..015a4c56 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -557,4 +557,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -559,4 +559,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @Override Spigot spigot(); // Spigot end @@ -25,7 +25,7 @@ index 4f5eb3676..d793de62c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java -index 0cd830d90..170a9aee5 100644 +index 0cd830d9..170a9aee 100644 --- a/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java @@ -51,4 +51,15 @@ public interface FallingBlock extends Entity { @@ -45,7 +45,7 @@ index 0cd830d90..170a9aee5 100644 + } } diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java -index a439eaf56..04cc23ef1 100644 +index a439eaf5..04cc23ef 100644 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java @@ -37,4 +37,15 @@ public interface TNTPrimed extends Explosive { @@ -65,5 +65,5 @@ index a439eaf56..04cc23ef1 100644 + } } -- -2.19.1 +2.20.1 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 0a2e5534db..cad5541a66 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 4263686098d71b1b539cb79fc04f04d0994c21c5 Mon Sep 17 00:00:00 2001 +From a33b574c104eaa05eebba870a7d61b1a5876d5ed 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 43239f844..fe8d34685 100644 +index 43239f84..fe8d3468 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -38,8 +38,8 @@ public final class NamespacedKey { @@ -21,10 +21,10 @@ index 43239f844..fe8d34685 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 06bcee03b..849ad2cbb 100644 +index 04573ec2..0750d64c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1567,6 +1567,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1570,6 +1570,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @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()} @@ -32,7 +32,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, Location location, int count, T data); -@@ -1582,6 +1583,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1585,6 +1586,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @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()} @@ -40,7 +40,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, T data); -@@ -1631,6 +1633,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1634,6 +1636,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @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()} @@ -48,7 +48,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1650,6 +1653,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1653,6 +1656,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @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()} @@ -56,7 +56,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data); -@@ -1705,6 +1709,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1708,6 +1712,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -64,7 +64,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); -@@ -1726,6 +1731,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1729,6 +1734,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -72,7 +72,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); -@@ -1748,6 +1754,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1751,6 +1757,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -80,7 +80,7 @@ index 06bcee03b..849ad2cbb 100644 */ public void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force); -@@ -1772,6 +1779,7 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1775,6 +1782,7 @@ public interface World extends PluginMessageRecipient, Metadatable { * @param force whether to send the particle to players within an extended * range and encourage their client to render it regardless of * settings @@ -89,7 +89,7 @@ index 06bcee03b..849ad2cbb 100644 public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force); diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java -index 107574546..6d5410eab 100644 +index 10757454..6d5410ea 100644 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java @@ -22,7 +22,7 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab @@ -102,7 +102,7 @@ index 107574546..6d5410eab 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java -index 9a569d3a3..8c5efd17e 100644 +index 9a569d3a..8c5efd17 100644 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java @@ -138,6 +138,7 @@ public interface AreaEffectCloud extends Entity { @@ -114,7 +114,7 @@ index 9a569d3a3..8c5efd17e 100644 void setParticle(Particle particle, T data); diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java -index 98af0563c..ec6890ae6 100644 +index 98af0563..ec6890ae 100644 --- a/src/main/java/org/bukkit/entity/Guardian.java +++ b/src/main/java/org/bukkit/entity/Guardian.java @@ -12,7 +12,7 @@ public interface Guardian extends Monster { @@ -127,7 +127,7 @@ index 98af0563c..ec6890ae6 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java -index cfce8fa57..8660070bb 100644 +index cfce8fa5..8660070b 100644 --- a/src/main/java/org/bukkit/entity/Horse.java +++ b/src/main/java/org/bukkit/entity/Horse.java @@ -151,7 +151,7 @@ public interface Horse extends AbstractHorse { @@ -140,7 +140,7 @@ 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 d10e3f99d..49de086e3 100644 +index d10e3f99..49de086e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -431,7 +431,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -233,7 +233,7 @@ index d10e3f99d..49de086e3 100644 public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 2a02ab855..e33d00b30 100644 +index 2a02ab85..e33d00b3 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -15,6 +15,7 @@ public interface Skeleton extends Monster { @@ -245,7 +245,7 @@ index 2a02ab855..e33d00b30 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java -index cf53ea22f..629233796 100644 +index bdc6206a..48034198 100644 --- a/src/main/java/org/bukkit/entity/Zombie.java +++ b/src/main/java/org/bukkit/entity/Zombie.java @@ -29,14 +29,14 @@ public interface Zombie extends Monster { @@ -266,7 +266,7 @@ index cf53ea22f..629233796 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java -index 6532c24fe..ee0b12736 100644 +index 6532c24f..ee0b1273 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java @@ -28,6 +28,7 @@ public class PlayerLoginEvent extends PlayerEvent { @@ -286,7 +286,7 @@ index 6532c24fe..ee0b12736 100644 public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot this(player, hostname, address, realAddress); // Spigot diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 762c43d69..ec2b8b8ed 100644 +index 762c43d6..ec2b8b8e 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -126,10 +126,10 @@ public interface ItemFactory { @@ -304,7 +304,7 @@ index 762c43d69..ec2b8b8ed 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java -index c8e68570f..45431b360 100644 +index c8e68570..45431b36 100644 --- a/src/main/java/org/bukkit/inventory/Merchant.java +++ b/src/main/java/org/bukkit/inventory/Merchant.java @@ -32,7 +32,7 @@ public interface Merchant { @@ -326,7 +326,7 @@ index c8e68570f..45431b360 100644 void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException; diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java -index 1413b361b..b4a8051cc 100644 +index 1413b361..b4a8051c 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -78,6 +78,7 @@ public class Potion { @@ -338,7 +338,7 @@ index 1413b361b..b4a8051cc 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java -index 40f8d12b9..33d192287 100644 +index 40f8d12b..33d19228 100644 --- a/src/main/java/org/bukkit/potion/PotionBrewer.java +++ b/src/main/java/org/bukkit/potion/PotionBrewer.java @@ -34,6 +34,8 @@ public interface PotionBrewer { @@ -351,7 +351,7 @@ index 40f8d12b9..33d192287 100644 */ public Collection getEffects(PotionType type, boolean upgraded, boolean extended); diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java -index 034421a76..f1a54c23c 100644 +index 034421a7..f1a54c23 100644 --- a/src/main/java/org/bukkit/potion/PotionType.java +++ b/src/main/java/org/bukkit/potion/PotionType.java @@ -68,6 +68,7 @@ public enum PotionType { @@ -381,7 +381,7 @@ index 034421a76..f1a54c23c 100644 */ @Deprecated diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java -index ab71f3c31..358ea386b 100644 +index ab71f3c3..358ea386 100644 --- a/src/main/java/org/bukkit/scoreboard/Team.java +++ b/src/main/java/org/bukkit/scoreboard/Team.java @@ -84,7 +84,7 @@ public interface Team { @@ -394,5 +394,5 @@ index ab71f3c31..358ea386b 100644 ChatColor getColor() throws IllegalStateException; -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch index 5298b7beb6..536105ec3d 100644 --- a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch @@ -1,14 +1,14 @@ -From 863ed563e69f6e02d31354d301825cfc27f89b58 Mon Sep 17 00:00:00 2001 +From 8853a70eb883c407c751dfe4e32e24c70e278c17 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d793de62..08399637 100644 +index 015a4c56..13de2d74 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -567,5 +567,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -569,5 +569,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { * @return Location where entity originates or null if not yet added */ Location getOrigin(); @@ -22,5 +22,5 @@ index d793de62..08399637 100644 // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch index 3f0aa68cf9..a630516295 100644 --- a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From fcc3fbaed0fd4baeab9f53a7c9ac847cddfb0a0f Mon Sep 17 00:00:00 2001 +From 33502f142938f89056e273cdbea58ca83c760d89 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,10 +9,10 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 24100a6a..d71815d1 100644 +index 46a29d3d..e3337d05 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java -@@ -226,6 +226,15 @@ public interface Block extends Metadatable { +@@ -227,6 +227,15 @@ public interface Block extends Metadatable { */ BlockState getState(); @@ -29,5 +29,5 @@ index 24100a6a..d71815d1 100644 * Returns the biome that this block resides in * -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch index 69dfbafeb2..b0482bdf00 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 9688d6dab34b7bac4f43b9c390fb582772b04b06 Mon Sep 17 00:00:00 2001 +From 2e6605a41302606cb9c28be3fa9d967d67dfd437 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -452,10 +452,10 @@ index 4d0acaf5..827aa00c 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 99fbf327..1f63eba8 100644 +index 3cc161de..c9b3ff76 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1967,7 +1967,57 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1970,7 +1970,57 @@ public interface World extends PluginMessageRecipient, Metadatable { * the type of this depends on {@link Particle#getDataType()} * @param Type */ @@ -515,5 +515,5 @@ index 99fbf327..1f63eba8 100644 /** * Spawns the particle (the number of times specified by count) -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0119-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch index 39c07eb0d2..63d8b47939 100644 --- a/Spigot-API-Patches/0119-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From aa7fb497e60582cd247d5e3a6b36816f1b2e4a87 Mon Sep 17 00:00:00 2001 +From f2dced1d9d8a844f6760f7d9c39a1c6d1837ff90 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 08399637..f94160bf 100644 +index 13de2d74..2dd7a03c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -1,5 +1,6 @@ @@ -16,7 +16,7 @@ index 08399637..f94160bf 100644 import org.bukkit.Location; import org.bukkit.EntityEffect; import org.bukkit.Nameable; -@@ -574,5 +575,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { +@@ -576,5 +577,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); @@ -30,5 +30,5 @@ index 08399637..f94160bf 100644 // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch index bbcb4ee687..79cf6331d5 100644 --- a/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From f909641ae51041c6ecd8af3fa5136461e8e8e7bf Mon Sep 17 00:00:00 2001 +From 6c57e466396348da4e30c996c0d1f3b8555d5ea2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -49,7 +49,7 @@ index 8dcb15fb..7e1ee875 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 8e322cab..adace47c 100644 +index 6635285f..071a8490 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,10 +91,10 @@ index 8e322cab..adace47c 100644 * Gets the y coordinate of the lowest block at this position such that the * block and all blocks above it are transparent for lighting purposes. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index d71815d1..e529e204 100644 +index e3337d05..1f97e3d3 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java -@@ -142,6 +142,33 @@ public interface Block extends Metadatable { +@@ -143,6 +143,33 @@ public interface Block extends Metadatable { */ int getZ(); @@ -129,5 +129,5 @@ index d71815d1..e529e204 100644 * Gets the Location of the block * -- -2.19.1 +2.20.1 diff --git a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch index 32cfd59347..0298158d81 100644 --- a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From a598a45a2d27aa5cf843f0de44e3dc056571e6a1 Mon Sep 17 00:00:00 2001 +From 09d151a0244868bedef166b468f436c807180199 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -39,10 +39,10 @@ index b3c5766a2..29fe031d8 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 1fadbf054..96cbaef52 100644 +index d40127075..e7ccee480 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -@@ -274,6 +274,20 @@ public class CraftBlock implements Block { +@@ -275,6 +275,20 @@ public class CraftBlock implements Block { } public BlockState getState() { @@ -131,5 +131,5 @@ index e6f86cc4b..3a8f64360 100644 @Override -- -2.20.0 +2.20.1 diff --git a/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch index 5822bad340..bd85a32fb0 100644 --- a/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0335-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From 682fb9d99363928b21ea5ae8596fe6352cf1386f Mon Sep 17 00:00:00 2001 +From 282209ce7be1433a8ce6153e59ba0a56737fc9d7 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation @@ -47,10 +47,10 @@ index 1423419b9..2d855aae6 100644 return this.getBlock().n(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index d470e2b34..b9279d925 100644 +index 57f483367..8ac8969e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -@@ -501,7 +501,17 @@ public class CraftBlockData implements BlockData { +@@ -531,7 +531,17 @@ public class CraftBlockData implements BlockData { return craft; } @@ -69,5 +69,5 @@ index d470e2b34..b9279d925 100644 } } -- -2.20.0 +2.20.1 diff --git a/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 79f9baa62c..1359553809 100644 --- a/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0357-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,23 +1,23 @@ -From 1eb74e11de99c6807477c751d4ea094e73556cd4 Mon Sep 17 00:00:00 2001 +From 31a4ba2082b703b6b02ee16f019af60a82edbe8b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 35c436d19..fcfb17e4e 100644 +index 00026eef7..207f95dcf 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java -@@ -42,7 +42,7 @@ public class ArgumentBlock { +@@ -43,7 +43,7 @@ public class ArgumentBlock { private final boolean j; - private final Map, Comparable> k = Maps.newHashMap(); + private final Map, Comparable> k = Maps.newLinkedHashMap(); // CraftBukkit - stable private final Map l = Maps.newHashMap(); - private MinecraftKey m = new MinecraftKey(""); + private MinecraftKey m = new MinecraftKey(""); public MinecraftKey getBlockKey() { return this.m; } // Paper - OBFHELPER private BlockStateList n; private IBlockData o; @Nullable -@@ -71,11 +71,13 @@ public class ArgumentBlock { +@@ -72,11 +72,13 @@ public class ArgumentBlock { return this.p; } @@ -30,77 +30,9 @@ index 35c436d19..fcfb17e4e 100644 + public ArgumentBlock parse(boolean parseTile) throws CommandSyntaxException { return this.a(parseTile); } // Paper - OBFHELPER public ArgumentBlock a(boolean flag) throws CommandSyntaxException { this.s = this::l; - if (this.i.canRead() && this.i.peek() == '#') { -@@ -135,7 +137,7 @@ public class ArgumentBlock { - if (this.q != null && !this.q.getKey().isEmpty()) { - Tag tag = TagsBlock.a().a(this.q); - if (tag != null) { -- for(Block block : tag.a()) { -+ for(Block block : (java.util.Collection) tag.a()) { // Paper - decompiler fix - for(IBlockState iblockstate : block.getStates().d()) { - if (!this.l.containsKey(iblockstate.a()) && iblockstate.a().startsWith(sx)) { - suggestionsbuilder.suggest(iblockstate.a() + '='); -@@ -163,7 +165,7 @@ public class ArgumentBlock { - if (this.q != null) { - Tag tag = TagsBlock.a().a(this.q); - if (tag != null) { -- for(Block block : tag.a()) { -+ for(Block block : (java.util.Collection) tag.a()) { // Paper - decompiler fix - if (block.isTileEntity()) { - return true; - } -@@ -198,9 +200,9 @@ public class ArgumentBlock { - private static > SuggestionsBuilder a(SuggestionsBuilder suggestionsbuilder, IBlockState iblockstate) { - for(Comparable comparable : iblockstate.d()) { - if (comparable instanceof Integer) { -- suggestionsbuilder.suggest(comparable); -+ suggestionsbuilder.suggest((Integer) comparable); // Paper - decompiler fix - } else { -- suggestionsbuilder.suggest(iblockstate.a(comparable)); -+ suggestionsbuilder.suggest(iblockstate.a((T) comparable)); // Paper - decompiler fix - } - } - -@@ -213,7 +215,7 @@ public class ArgumentBlock { - Tag tag = TagsBlock.a().a(this.q); - if (tag != null) { - label40: -- for(Block block : tag.a()) { -+ for(Block block : (java.util.Collection) tag.a()) { // Paper - decompiler fix - IBlockState iblockstate = block.getStates().a(sx); - if (iblockstate != null) { - a(suggestionsbuilder, iblockstate); -@@ -254,7 +256,7 @@ public class ArgumentBlock { - boolean flag = false; - boolean flag1 = false; - -- for(Block block : tag.a()) { -+ for(Block block : (java.util.Collection) tag.a()) { // Paper - decompiler fix - flag |= !block.getStates().d().isEmpty(); - flag1 |= block.isTileEntity(); - if (flag && flag1) { -@@ -453,8 +455,8 @@ public class ArgumentBlock { - private > void a(IBlockState iblockstate, String sx, int ix) throws CommandSyntaxException { - Optional optional = iblockstate.b(sx); - if (optional.isPresent()) { -- this.o = (IBlockData)this.o.set(iblockstate, (Comparable)optional.get()); -- this.k.put(iblockstate, optional.get()); -+ this.o = (IBlockData)this.o.set(iblockstate, (T)optional.get()); // Paper - decompiler fix -+ this.k.put(iblockstate, (Comparable) optional.get()); // Paper - decompiler fix - } else { - this.i.setCursor(ix); - throw e.createWithContext(this.i, this.m.toString(), iblockstate.a(), sx); -@@ -489,7 +491,7 @@ public class ArgumentBlock { - private static > void a(StringBuilder stringbuilder, IBlockState iblockstate, Comparable comparable) { - stringbuilder.append(iblockstate.a()); - stringbuilder.append('='); -- stringbuilder.append(iblockstate.a(comparable)); -+ stringbuilder.append(iblockstate.a((T) comparable)); // Paper - decompile fix - } - - public CompletableFuture a(SuggestionsBuilder suggestionsbuilder) { + if (this.i.canRead() && this.i.peek() == 35) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 197563552..d34b017f9 100644 +index 2446badd8..356390db7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -81,6 +81,12 @@ import javax.annotation.Nullable; @@ -484,5 +416,5 @@ index 197563552..d34b017f9 100644 + // Paper end } -- -2.20.0 +2.20.1 diff --git a/work/Bukkit b/work/Bukkit index b850a822c1..78568d11d3 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit b850a822c1cd79cc5b8e9181b4b9e6b61977e0ec +Subproject commit 78568d11d3ad8bb1f6a90c1b5dff3394f22f12fc diff --git a/work/CraftBukkit b/work/CraftBukkit index bb6f384a83..1b982fd67e 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bb6f384a830548def9c73264dab1a4d06fc2bdf4 +Subproject commit 1b982fd67efd09964d565b9ee71df9d4fb0eb093 diff --git a/work/Spigot b/work/Spigot index 1dc156ce48..573cdf2c73 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 1dc156ce484f25ce6cfc7526f1de88aac5ac7a95 +Subproject commit 573cdf2c734efd81d75a18f0b6c64d5b4b95efa2