Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-6952: Tag#isTagged throws NullPointerException in 1.18.2

Browse Source
This commit is contained in:
DerFrZocker 2022-03-01 21:02:14 +01:00
parent 05a38da190
commit 6e755020ab
No known key found for this signature in database
GPG Key ID: 713F71FFFE1DDF91
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java
View File

@ -17,7 +17,14 @@ public class CraftBlockTag extends CraftTag<Block, Material> {
@Override @Override
public boolean isTagged(Material item) { 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);
} }
@Override @Override

9
src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java
View File

@ -17,7 +17,14 @@ public class CraftItemTag extends CraftTag<Item, Material> {
@Override @Override
public boolean isTagged(Material item) { public boolean isTagged(Material item) {
return CraftMagicNumbers.getItem(item).builtInRegistryHolder().is(tag); Item minecraft = CraftMagicNumbers.getItem(item);
// SPIGOT-6952: A Material is not necessary an item, in this case return false
if (minecraft == null) {
return false;
}
return minecraft.builtInRegistryHolder().is(tag);
} }
@Override @Override