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

SPIGOT-7376: Exception with getBlockData when hasBlockData is false

Browse Source
This commit is contained in:
md_5 2023-06-08 21:19:44 +10:00
parent 725545630d
commit f3b2b22103
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@ -45,6 +45,7 @@ import net.minecraft.nbt.NBTTagString;
import net.minecraft.network.chat.IChatBaseComponent; import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.world.entity.EnumItemSlot; import net.minecraft.world.entity.EnumItemSlot;
import net.minecraft.world.item.ItemBlock; import net.minecraft.world.item.ItemBlock;
import net.minecraft.world.level.block.state.IBlockData;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.EnumUtils;
import org.bukkit.Material; import org.bukkit.Material;
@ -911,12 +912,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@Override @Override
public boolean hasBlockData() { public boolean hasBlockData() {
return this.blockData != null; return this.blockData != null;
} }
@Override @Override
public BlockData getBlockData(Material material) { public BlockData getBlockData(Material material) {
return CraftBlockData.fromData(ItemBlock.getBlockState(CraftMagicNumbers.getBlock(material).defaultBlockState(), blockData)); IBlockData defaultData = CraftMagicNumbers.getBlock(material).defaultBlockState();
return CraftBlockData.fromData((hasBlockData()) ? ItemBlock.getBlockState(defaultData, blockData) : defaultData);
} }
@Override @Override