From bdf7b4d86acab5d172cbf1fca4be60a7dc6d1db6 Mon Sep 17 00:00:00 2001 From: maximumpower55 Date: Wed, 26 Jun 2024 15:05:09 -0700 Subject: [PATCH] Fix balloon pick result applying default color --- .../content/balloon/entity/AbstractBalloon.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/one/devos/nautical/up_and_away/content/balloon/entity/AbstractBalloon.java b/src/main/java/one/devos/nautical/up_and_away/content/balloon/entity/AbstractBalloon.java index ac60de6..dcc6cb7 100644 --- a/src/main/java/one/devos/nautical/up_and_away/content/balloon/entity/AbstractBalloon.java +++ b/src/main/java/one/devos/nautical/up_and_away/content/balloon/entity/AbstractBalloon.java @@ -90,7 +90,7 @@ protected AbstractBalloon(EntityType type, Level level, ItemStack stack, @Nul @Override protected void defineSynchedData(Builder builder) { builder.define(SHAPE_ID, DEFAULT_SHAPE.id); - builder.define(COLOR, AbstractBalloon.DEFAULT_COLOR); + builder.define(COLOR, DEFAULT_COLOR); } @Override @@ -342,11 +342,12 @@ public boolean isPickable() { @Nullable @Override public ItemStack getPickResult() { - return Util.make(new ItemStack(this.baseItem()), stack -> stack.applyComponents( + int color = this.color(); + return Util.make(new ItemStack(this.baseItem()), color != DEFAULT_COLOR ? stack -> stack.applyComponents( DataComponentPatch.builder() - .set(DataComponents.DYED_COLOR, new DyedItemColor(this.color(), true)). + .set(DataComponents.DYED_COLOR, new DyedItemColor(color, true)). build() - )); + ) : stack -> {}); } @Override