From 43645da8855c24acfe35a65a98416ecb9b14939f Mon Sep 17 00:00:00 2001 From: DaPigGuy Date: Sat, 16 Nov 2024 02:01:58 -0800 Subject: [PATCH] block/sandstone.go: Fix invalid sandstone variant item ids Blame Seb! --- server/block/sandstone.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/block/sandstone.go b/server/block/sandstone.go index 0c983a346..466cf2547 100644 --- a/server/block/sandstone.go +++ b/server/block/sandstone.go @@ -28,10 +28,14 @@ func (s Sandstone) BreakInfo() BreakInfo { // EncodeItem ... func (s Sandstone) EncodeItem() (name string, meta int16) { + var prefix string + if s.Type != NormalSandstone() { + prefix = s.Type.String() + "_" + } if s.Red { - return "minecraft:red_sandstone", int16(s.Type.Uint8()) + return "minecraft:" + prefix + "red_sandstone", 0 } - return "minecraft:sandstone", int16(s.Type.Uint8()) + return "minecraft:" + prefix + "sandstone", 0 } // EncodeBlock ... @@ -40,11 +44,10 @@ func (s Sandstone) EncodeBlock() (string, map[string]any) { if s.Type != NormalSandstone() { prefix = s.Type.String() + "_" } - suffix := "sandstone" if s.Red { - suffix = "red_sandstone" + return "minecraft:" + prefix + "red_sandstone", nil } - return "minecraft:" + prefix + suffix, nil + return "minecraft:" + prefix + "sandstone", nil } // SmeltInfo ...