From 5791e512b73a73775f74580925ef3249b35e5032 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 27 Jul 2020 23:15:22 -0400 Subject: [PATCH] Fix MaterialTags tests to actually pass --- Spigot-API-Patches/0154-Add-Material-Tags.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch index d88b7647b..ade1ae6b1 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..62313883aa183003726f268c8d9f210d83428f59 +index 0000000000000000000000000000000000000000..af353bbdf8c2710d43d31237ea76eb9281aa463b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,512 @@ +@@ -0,0 +1,511 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -712,8 +712,7 @@ index 0000000000000000000000000000000000000000..62313883aa183003726f268c8d9f210d + * 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); ++ .add(Material.EGG, Material.SNOWBALL, Material.SPLASH_POTION, Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET); + + @SuppressWarnings("unchecked") + public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))