Sfoglia il codice sorgente

Add more null checks

Signed-off-by: shedaniel <daniel@shedaniel.me>
shedaniel 5 anni fa
parent
commit
9eae258216

+ 1 - 1
gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx3G
-mod_version=4.6.3
+mod_version=4.6.4
 supported_version=1.16.x
 minecraft_version=1.16.1
 yarn_version=1.16.1+build.4+legacy.20w09a+build.8

+ 2 - 2
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;

+ 2 - 4
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;