Spigot / CraftBukkit / 6e755020abb

Commits

DerFrZocker authored 6e755020abb 01 Mar 2022

SPIGOT-6952: Tag#isTagged throws NullPointerException in 1.18.2

Modified

-10
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-11
-12
+public class CraftBlockTag extends CraftTag<Block, Material> {
-13
-14
+    public CraftBlockTag(IRegistry<Block> registry, TagKey<Block> tag) {
-15
+        super(registry, tag);
-16
+    }
-17
-18
+    @Override
-19
+    public boolean isTagged(Material item) {
--
+        return CraftMagicNumbers.getBlock(item).builtInRegistryHolder().is(tag);
-+
+        Block block = CraftMagicNumbers.getBlock(item);
-+
-+
+        // SPIGOT-6952: A Material is not necessary a block, in this case return false
-+
+        if (block == null) {
-+
+            return false;
-+
+        }
-+
-+
+        return block.builtInRegistryHolder().is(tag);
-28
+    }
-29
-30
+    @Override
-31
+    public Set<Material> getValues() {
-32
+        return Collections.unmodifiableSet(getHandle().stream().map((block) -> CraftMagicNumbers.getMaterial(block.value())).collect(Collectors.toSet()));
-33
+    }
-34
+}