From 62cfec84d87226e6b9e161449eea4d1701632270 Mon Sep 17 00:00:00 2001 From: Kyle Lin Date: Tue, 25 Feb 2025 16:00:06 +0800 Subject: [PATCH] Fix potential NPE when accessing TextWidget property --- .../java/com/cleanroommc/modularui/widgets/TextWidget.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cleanroommc/modularui/widgets/TextWidget.java b/src/main/java/com/cleanroommc/modularui/widgets/TextWidget.java index 8651ef740..5fac14760 100644 --- a/src/main/java/com/cleanroommc/modularui/widgets/TextWidget.java +++ b/src/main/java/com/cleanroommc/modularui/widgets/TextWidget.java @@ -5,6 +5,7 @@ import com.cleanroommc.modularui.screen.viewport.ModularGuiContext; import com.cleanroommc.modularui.theme.WidgetTheme; import com.cleanroommc.modularui.utils.Alignment; +import com.cleanroommc.modularui.utils.Color; import com.cleanroommc.modularui.widget.Widget; import com.cleanroommc.modularui.widget.sizer.Box; @@ -86,11 +87,11 @@ public float getScale() { } public int getColor() { - return this.color; + return this.color == null ? Color.BLACK.main : this.color; } public boolean isShadow() { - return this.shadow; + return this.shadow != null && this.shadow; } public TextWidget alignment(Alignment alignment) {