fix: page crashes and place back error

HelheimLabs · Sep 12, 2023 · 0dafc04 · 0dafc04
1 parent 8a3d079
commit 0dafc04
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/packages/client/src/hooks/useChessboard.ts b/packages/client/src/hooks/useChessboard.ts
@@ -121,10 +121,15 @@ const useChessboard = () => {
   }, [BoardList, PieceInBattleList]);
 
   const PiecesList = playerObj?.heroes.map((row, _index: any) => {
-    const hero = getComponentValueStrict(
+    const hero = getComponentValue(
       Hero,
       encodeEntity({ id: "bytes32" }, { id: numberToHex(row, { size: 32 }) })
     );
+
+    if (!hero) {
+      return undefined;
+    }
+
     const creature = getComponentValue(
       Creature,
       encodeCreatureEntity(hero.creatureId)

diff --git a/packages/client/src/ui/Chessboard.tsx b/packages/client/src/ui/Chessboard.tsx
@@ -84,6 +84,9 @@ const Chessboard = ({ setAcHeroFn }: { setAcHeroFn: (any) => void }) => {
       });
     } else {
       PiecesList?.map((item) => {
+        if (!item) {
+          return;
+        }
         const position = convertToIndex(item.x, item.y);
         newSquares[position] = {
           ...item,

diff --git a/packages/client/src/ui/Synergy.tsx b/packages/client/src/ui/Synergy.tsx
@@ -53,10 +53,11 @@ export function useSynergyCount(uniqueCreatureIds: bigint[]) {
   };
 
   uniqueCreatureIds.forEach((v) => {
-    const creatureValue = getComponentValueStrict(
-      Creature,
-      encodeCreatureEntity(v)
-    );
+    const creatureValue = getComponentValue(Creature, encodeCreatureEntity(v));
+
+    if (!creatureValue) {
+      return;
+    }
 
     raceSynergy[creatureValue.race as HeroRace] += 1;
     classSynergy[creatureValue.class as HeroClass] += 1;

diff --git a/packages/contracts/src/systems/PlaceSystem.sol b/packages/contracts/src/systems/PlaceSystem.sol
@@ -91,7 +91,7 @@ contract PlaceSystem is System {
     function swapInventory(uint256 fromIndex, uint256 toIndex) public onlyWhenGamePreparing {
         address player = _msgSender();
 
-        uint8 maxIdx = GameConfig.getInventorySlotNum(0) - 1;
+        uint8 maxIdx = GameConfig.getInventorySlotNum(0);
         require(fromIndex < maxIdx, "index out of range");
         require(toIndex < maxIdx, "index out of range");