fix: 🐛 Fixed controller-connected double chests crashing during tier upgrades

Author: P3pp3rF1y

gradle.properties

@@ -15,7 +15,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedstorage
 mod_name=Sophisticated Storage
 mod_license=All Rights Reserved
-mod_version=1.5.89
+mod_version=1.5.90
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y, Ridanisaurus
 mod_description=Fancy and functional storage containers.
@@ -41,7 +41,7 @@ athena_cf_file_id=5431579
 sawmill_cf_file_id=6119477
 moonlightlib_cf_file_id=6224057
 toms_storage_cf_file_id=7275186
-sc_version=[1.21.4-1.4.81,1.21.5)
+sc_version=[1.21.4-1.4.82,1.21.5)
 sb_version=[1.21.4-3.25.74,1.21.5)
 
 # publish

src/main/java/net/p3pp3rf1y/sophisticatedstorage/block/ChestBlockEntity.java

@@ -434,7 +434,7 @@ && getStorageWrapper().getInventoryHandler().getSlots() > chestBlock.getNumberOf
 
 	@Override
 	public void changeSlots(int newSlots) {
-		if (hasStorageData()) {
+		if (hasStorageData() && !isBeingUpgraded()) {
 			super.changeSlots(newSlots);
 		}
 	}

src/main/java/net/p3pp3rf1y/sophisticatedstorage/item/StorageTierUpgradeItem.java

@@ -167,20 +167,23 @@ private boolean upgradeDoubleChest(BlockPos pos, Level level, BlockState state,
 
 			chestBlockEntity.setBeingUpgraded(true);
 			otherBlockEntity.setBeingUpgraded(true);
+			StorageBlockEntity newMainBE;
 			if (chestBlockEntity.isMainChest()) {
-				StorageBlockEntity newMainBE = upgradeStorageBlock(pos, level, chestBlockEntity, getBlockState(state),
-						storageBlock.getNumberOfInventorySlots() * 2, storageBlock.getNumberOfUpgradeSlots());
+				newMainBE = upgradeStorageBlock(pos, level, chestBlockEntity, getBlockState(state), storageBlock.getNumberOfInventorySlots() * 2,
+						storageBlock.getNumberOfUpgradeSlots());
 				upgradeStorageBlock(otherPos, level, otherBlockEntity, otherBlockState, storageBlock.getNumberOfInventorySlots(),
 						storageBlock.getNumberOfUpgradeSlots()).setBeingUpgraded(false);
 				newMainBE.setBeingUpgraded(false);
 			} else {
 				StorageBlockEntity newOtherBE = upgradeStorageBlock(pos, level, chestBlockEntity, getBlockState(state),
 						storageBlock.getNumberOfInventorySlots(), storageBlock.getNumberOfUpgradeSlots());
-				upgradeStorageBlock(otherPos, level, otherBlockEntity, otherBlockState, storageBlock.getNumberOfInventorySlots() * 2,
-						storageBlock.getNumberOfUpgradeSlots()).setBeingUpgraded(false);
+				newMainBE = upgradeStorageBlock(otherPos, level, otherBlockEntity, otherBlockState, storageBlock.getNumberOfInventorySlots() * 2,
+						storageBlock.getNumberOfUpgradeSlots());
+				newMainBE.setBeingUpgraded(false);
 				newOtherBE.setBeingUpgraded(false);
 			}
 			otherBlockState.updateNeighbourShapes(level, otherPos, 3);
+			newMainBE.changeSlots(newMainBE.getStorageWrapper().getInventoryHandler().getSlots());
 
 			return true;
 		}