From 115972651ac48cbd6da111fdbd10bc32fe0fee1e Mon Sep 17 00:00:00 2001
From: Ineusia <ineusia@yahoo.com>
Date: Mon, 27 Jul 2020 22:05:54 -0500
Subject: [PATCH] Expand MaterialTags v2 (#4009)

---
 .../0154-Add-Material-Tags.patch              | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch
index 56794485d..d88b7647b 100644
--- a/Spigot-API-Patches/0154-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0154-Add-Material-Tags.patch
@@ -204,10 +204,10 @@ index 0000000000000000000000000000000000000000..c91ea2a0679a7f3a5627b5a008e0b39d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4932bd60d30b73e03fecc75f57212f46881d2843
+index 0000000000000000000000000000000000000000..62313883aa183003726f268c8d9f210d83428f59
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,497 @@
+@@ -0,0 +1,512 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -700,6 +700,21 @@ index 0000000000000000000000000000000000000000..4932bd60d30b73e03fecc75f57212f46
 +        .endsWith("_BOOTS")
 +        .ensureSize("BOOTS", 6);
 +
++    /**
++     * Covers the variants of bows.
++     */
++    public static final MaterialSetTag BOWS = new MaterialSetTag(keyFor("bows"))
++        .add(Material.BOW)
++        .add(Material.CROSSBOW)
++        .ensureSize("BOWS", 2);
++
++    /**
++     * Covers the variants of player-throwable projectiles (not requiring a bow or any other "assistance").
++     */
++    public static final MaterialSetTag THROWABLE_PROJECTILES = new MaterialSetTag(keyFor("throwable_projectiles"))
++        .add(Material.EGG, Material.SNOWBALL, Material.SPLASH_POTION, Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET)
++        .ensureSize("THROWABLE_PROJECTILES", 2);
++
 +    @SuppressWarnings("unchecked")
 +    public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
 +        .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS);