use hook util

tenetxyz · May 13, 2024 · 66cd7ec · 66cd7ec
1 parent 4699813
commit 66cd7ec
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 851 deletions.
diff --git a/packages/hardhat/contracts/Game.sol b/packages/hardhat/contracts/Game.sol
@@ -19,6 +19,7 @@ import { ObjectTypeMetadata } from "@biomesaw/world/src/codegen/tables/ObjectTyp
 import { AirObjectID } from "@biomesaw/world/src/ObjectTypeIds.sol";
 import { getObjectType, getEntityAtCoord, getPosition, getEntityFromPlayer, getObjectTypeAtCoord } from "../utils/EntityUtils.sol";
 import { voxelCoordsAreEqual } from "@biomesaw/utils/src/VoxelCoordUtils.sol";
+import { decodeCallData } from "../utils/HookUtils.sol";
 
 import { NamedBuild } from "../utils/GameUtils.sol";
 
@@ -93,8 +94,8 @@ contract Game is ICustomUnregisterDelegation, IOptionalSystemHook {
     bytes memory callData
   ) external override onlyBiomeWorld {
     if (ResourceId.unwrap(systemId) == ResourceId.unwrap(BuildSystemId)) {
-      Slice callDataArgs = SliceLib.getSubslice(callData, 4);
-      (, VoxelCoord memory coord) = abi.decode(callDataArgs.toBytes(), (uint8, VoxelCoord));
+      (, bytes memory callDataArgs) = decodeCallData(callData);
+      (, VoxelCoord memory coord) = abi.decode(callDataArgs, (uint8, VoxelCoord));
       coordHashToBuilder[getCoordHash(coord)] = msgSender;
     }
   }