From c473e9674a8c5c43091f804191afec2a752834d5 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 25 Nov 2021 14:29:52 -0800
Subject: [PATCH] Fixup duplicated field

---
 .../bukkit/parsers/BlockPredicateArgument.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java
index 9849a6bd..99469afc 100644
--- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java
+++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java
@@ -141,13 +141,13 @@ public final class BlockPredicateArgument<C> extends CommandArgument<C, BlockPre
      */
     public static final class Parser<C> implements ArgumentParser<C, BlockPredicate> {
 
-        private static final Class<?> TAG_REGISTRY_CLASS;
+        private static final Class<?> TAG_CONTAINER_CLASS;
 
         static {
             if (CraftBukkitReflection.MAJOR_REVISION > 12 && CraftBukkitReflection.MAJOR_REVISION < 16) {
-                TAG_REGISTRY_CLASS = CraftBukkitReflection.needNMSClass("TagRegistry");
+                TAG_CONTAINER_CLASS = CraftBukkitReflection.needNMSClass("TagRegistry");
             } else {
-                TAG_REGISTRY_CLASS = CraftBukkitReflection.firstNonNullOrThrow(
+                TAG_CONTAINER_CLASS = CraftBukkitReflection.firstNonNullOrThrow(
                         () -> "Couldn't find TagContainer class",
                         CraftBukkitReflection.findNMSClass("ITagRegistry"),
                         CraftBukkitReflection.findMCClass("tags.ITagRegistry"),
@@ -193,10 +193,6 @@ public final class BlockPredicateArgument<C> extends CommandArgument<C, BlockPre
                 CraftBukkitReflection.findMCClass("core.BlockPosition"),
                 CraftBukkitReflection.findMCClass("core.BlockPos")
         );
-        private static final @Nullable Class<?> TAG_CONTAINER_CLASS = CraftBukkitReflection.firstNonNullOrNull(
-                CraftBukkitReflection.findClass("net.minecraft.tags.TagContainer"),
-                CraftBukkitReflection.findClass("net.minecraft.tags.ITagRegistry")
-        );
         private static final Constructor<?> BLOCK_POSITION_CTR =
                 CraftBukkitReflection.needConstructor(BLOCK_POSITION_CLASS, int.class, int.class, int.class);
         private static final Constructor<?> SHAPE_DETECTOR_BLOCK_CTR = CraftBukkitReflection
@@ -204,8 +200,8 @@ public final class BlockPredicateArgument<C> extends CommandArgument<C, BlockPre
         private static final Method GET_HANDLE_METHOD = CraftBukkitReflection.needMethod(CRAFT_WORLD_CLASS, "getHandle");
         private static final Method CREATE_PREDICATE_METHOD = CraftBukkitReflection.firstNonNullOrThrow(
                 () -> "create on BlockPredicateArgument$Result",
-                CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "create", TAG_REGISTRY_CLASS),
-                CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "a", TAG_REGISTRY_CLASS)
+                CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "create", TAG_CONTAINER_CLASS),
+                CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "a", TAG_CONTAINER_CLASS)
         );
         private static final Method GET_SERVER_METHOD = CraftBukkitReflection.streamMethods(
                 COMMAND_LISTENER_WRAPPER_CLASS,
@@ -216,7 +212,7 @@ public final class BlockPredicateArgument<C> extends CommandArgument<C, BlockPre
                 () -> "getTags method on MinecraftServer",
                 CraftBukkitReflection.findMethod(MINECRAFT_SERVER_CLASS, "getTagRegistry"),
                 CraftBukkitReflection.findMethod(MINECRAFT_SERVER_CLASS, "getTags"),
-                TAG_CONTAINER_CLASS == null ? null : CraftBukkitReflection.streamMethods(MINECRAFT_SERVER_CLASS, stream ->
+                CraftBukkitReflection.streamMethods(MINECRAFT_SERVER_CLASS, stream ->
                         stream.filter(it -> it.getReturnType().equals(TAG_CONTAINER_CLASS) && it.getParameterCount() == 0)
                                 .findFirst().orElse(null))
         );