diff options
| author | u9g <[email protected]> | 2022-06-14 19:03:29 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-15 00:03:29 +0100 |
| commit | 072f54c5f995de56e1c97dc15a4db4b97d688454 (patch) | |
| tree | 9dc9f516a2bcf68a979f97b912a642ebe85144ef | |
| parent | ef5d95f9fbb38cfa03d64188f6fab13a15598c93 (diff) | |
| download | Paper-072f54c5f995de56e1c97dc15a4db4b97d688454.tar.gz Paper-072f54c5f995de56e1c97dc15a4db4b97d688454.zip | |
Add ARMOR tag to MaterialTags (1.18.2) (#7880)
| -rw-r--r-- | patches/api/0156-Add-Material-Tags.patch | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch index 703b063034..a20ee3bdc3 100644 --- a/patches/api/0156-Add-Material-Tags.patch +++ b/patches/api/0156-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..f5ae132cef01666bacda11422c0b73dd585fea27 +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..f5ae132cef01666bacda11422c0b73dd + .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 5a25301a81b0e88a4891cbc4710289544d44105c..34d23f53acf00620223731c4fdacffde9cff41a8 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; |