fix: patch for 73, not completely fixed

Author: Jamalam360

CHANGELOG.md

@@ -1,7 +1,3 @@
-# Release 3.0.0
+# Release 3.0.1
 
-- General bug fixes
-- Modern version support and 1.20.1 backport
-- Upgradeable belt slots
-
-1.21.11 support will be added when Accessories is updated.
+- Patch fix for crash detailed in #73 (until further information about the root cause is available).

common/src/main/java/io/github/jamalam360/utility_belt/state/ServerStateManager.java

@@ -31,7 +31,20 @@ public void setInBelt(Player player, boolean inBelt) {
 
 	@Override
 	public int getSelectedBeltSlot(Player player) {
-		return getState(player).selectedBeltSlot;
+		if (!isInBelt(player)) {
+			return -1;
+		}
+
+		int slot = getState(player).selectedBeltSlot;
+		int beltSize = getInventory(player).getContainerSize();
+
+		if (slot < 0 || slot >= beltSize) {
+			slot = 0;
+			getState(player).selectedBeltSlot = 0;
+			UtilityBelt.LOGGER.warn("Broken state detected for player {}: selected belt slot {} is out of bounds for belt size {}. Resetting to 0.", player.getName().getString(), slot, beltSize);
+		}
+
+		return slot;
 	}
 
 	@Override

common/src/main/java/io/github/jamalam360/utility_belt/util/UtilityBeltInventory.java

@@ -1,5 +1,6 @@
 package io.github.jamalam360.utility_belt.util;
 
+import io.github.jamalam360.utility_belt.UtilityBelt;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
@@ -27,6 +28,11 @@ public UtilityBeltInventory copyWithSize(int newSize) {
     }
 
     public ItemStack getItem(int index) {
+        if (index < 0 || index >= this.getContainerSize()) {
+            UtilityBelt.LOGGER.warn("Attempted to access index {} of UtilityBeltInventory of size {}", index, this.getContainerSize());
+            return ItemStack.EMPTY;
+        }
+
         return items.get(index);
     }
 

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 org.gradle.parallel=true
 loom.ignoreDependencyLoomVersionValidation=true
 
-version=3.0.0+1.20.1
+version=3.0.1+1.20.1
 minecraft_version=1.20.1
 
 additional_minecraft_versions=