diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-07-01 16:50:13 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-07-01 16:50:13 +0800 |
| commit | 4088278dcd19688abe8f97a730cdd950dfd32192 (patch) | |
| tree | 8348bf870e400c50471c5d762bf10aafb08b373b /src | |
| parent | d24c14249e0fdab263e55dc016dd257b2eea69b4 (diff) | |
| download | RoughlyEnoughItems-4088278dcd19688abe8f97a730cdd950dfd32192.tar.gz RoughlyEnoughItems-4088278dcd19688abe8f97a730cdd950dfd32192.tar.bz2 RoughlyEnoughItems-4088278dcd19688abe8f97a730cdd950dfd32192.zip | |
Add more null checks
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java | 4 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index dc24b6c73..f06a1ac17 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -580,11 +580,11 @@ public class EntryListWidget extends WidgetWithBounds { if (widget.mouseReleased(mouseX, mouseY, button)) return true; ClientPlayerEntity player = minecraft.player; - if (ClientHelper.getInstance().isCheating() && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) { + if (ClientHelper.getInstance().isCheating() && player != null && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) { ClientHelper.getInstance().sendDeletePacket(); return true; } - if (player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) + if (player != null && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) return false; } return false; diff --git a/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java index 7e6bf2e5e..bda391df2 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/FavoritesListWidget.java @@ -37,8 +37,6 @@ import me.shedaniel.rei.api.widgets.Tooltip; import me.shedaniel.rei.gui.config.EntryPanelOrdering; import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.utils.CollectionUtils; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.util.math.MatrixStack; @@ -272,11 +270,11 @@ public class FavoritesListWidget extends WidgetWithBounds { if (widget.mouseReleased(mouseX, mouseY, button)) return true; ClientPlayerEntity player = minecraft.player; - if (ClientHelper.getInstance().isCheating() && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) { + if (ClientHelper.getInstance().isCheating() && player != null && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) { ClientHelper.getInstance().sendDeletePacket(); return true; } - if (player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) + if (player != null && player.inventory != null && !player.inventory.getCursorStack().isEmpty() && RoughlyEnoughItemsCore.hasPermissionToUsePackets()) return false; } return false; |