From 805423c90e9f7e4d012751ad9a080fc020206d5e Mon Sep 17 00:00:00 2001
From: u9g <git@u9g.dev>
Date: Tue, 14 Jun 2022 19:04:19 -0400
Subject: [PATCH] Add ARMOR tag to MaterialTags (1.19) (#7987)

---
 patches/api/0157-Add-Material-Tags.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
index 94cd65f111..5449244c62 100644
--- a/patches/api/0157-Add-Material-Tags.patch
+++ b/patches/api/0157-Add-Material-Tags.patch
@@ -113,10 +113,10 @@ index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab015
 +}
 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..c2861d5097e47611d0acd8c38696c9f225720942
+index 0000000000000000000000000000000000000000..728bc33cd6081f9462ab62d2ca6935573ccd3533
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,655 @@
+@@ -0,0 +1,661 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -627,6 +627,12 @@ index 0000000000000000000000000000000000000000..c2861d5097e47611d0acd8c38696c9f2
 +        .ensureSize("BOOTS", 6).lock();
 +
 +    /**
++     * Covers all variants of armor.
++     */
++    public static final MaterialSetTag ARMOR = new MaterialSetTag(keyFor("armor")).add(HELMETS, CHESTPLATES, LEGGINGS, BOOTS)
++        .ensureSize("ARMOR", 25).lock();
++
++    /**
 +     * Covers the variants of bows.
 +     */
 +    public static final MaterialSetTag BOWS = new MaterialSetTag(keyFor("bows"))
@@ -1067,7 +1073,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 7e3c8812247f86313c49c1a0d9af557abd30d029..33f022a01e44e6b806e6d38eef003da161b6be53 100644
+index 107d12d447be481928ee796f73b7acb2c4b9b2d8..42d0f31c2be2d39c4481f98c0756c4f1ae337717 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;