From 0367b35ce0dc55ebbf233eb8eb77c705657ccbbf Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 12:04:15 +0200 Subject: [PATCH] Never return null from Widget#getMessage since the narrator will always dereference it, leading to a crash. --- .../java/appeng/client/gui/widgets/SettingToggleButton.java | 2 +- src/main/java/appeng/client/gui/widgets/ToggleButton.java | 2 +- .../java/appeng/fluids/client/gui/widgets/FluidTankWidget.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 50ddad377..e5a532cd4 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -314,7 +314,7 @@ public class SettingToggleButton> extends IconButton { return name + '\n' + sb; } - return null; + return ""; } public String getFillVar() { diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 8d2f63560..5a13843b5 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -99,7 +99,7 @@ public class ToggleButton extends Button implements ITooltip { return name + '\n' + sb; } - return null; + return ""; } @Override diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index 80a97b4d1..3fc8a098d 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -93,7 +93,7 @@ public class FluidTankWidget extends Widget implements ITooltip { return desc + "\n" + amountToText; } - return null; + return ""; } @Override