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

SPIGOT-6464: Fix ShulkerBox#getColor for undyed shulkers

Browse Source
This commit is contained in:
md_5 2021-05-23 08:30:36 +10:00
parent d49530f9c4
commit 9c7acb6cbe
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
View File

@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.block;
import net.minecraft.sounds.SoundCategory;
import net.minecraft.sounds.SoundEffects;
import net.minecraft.world.item.EnumColor;
import net.minecraft.world.level.World;
import net.minecraft.world.level.block.BlockShulkerBox;
import net.minecraft.world.level.block.entity.TileEntityShulkerBox;
@ -39,9 +40,9 @@ public class CraftShulkerBox extends CraftLootable<TileEntityShulkerBox> impleme
@Override
public DyeColor getColor() {
net.minecraft.world.level.block.Block block = CraftMagicNumbers.getBlock(this.getType());
EnumColor color = ((BlockShulkerBox) CraftMagicNumbers.getBlock(this.getType())).color;
return DyeColor.getByWoolData((byte) ((BlockShulkerBox) block).color.getColorIndex());
return (color == null) ? null : DyeColor.getByWoolData((byte) color.getColorIndex());
}
@Override