aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-07-27 23:15:22 -0400
committerAikar <[email protected]>2020-07-27 23:15:22 -0400
commit5791e512b73a73775f74580925ef3249b35e5032 (patch)
treec9d0080cb42ffb0d41cdb6708fe7e66e26783bb6
parent115972651ac48cbd6da111fdbd10bc32fe0fee1e (diff)
downloadPaper-5791e512b73a73775f74580925ef3249b35e5032.tar.gz
Paper-5791e512b73a73775f74580925ef3249b35e5032.zip
Fix MaterialTags tests to actually pass
-rw-r--r--Spigot-API-Patches/0154-Add-Material-Tags.patch7
1 files 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 d88b7647b0..ade1ae6b1a 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"))