From ec562aa4c7f6dbfbc531bfd5b5efa4a3ba5d902e Mon Sep 17 00:00:00 2001 From: ForestOfLight Date: Thu, 10 Jul 2025 19:30:29 -0700 Subject: [PATCH] don't add easy place item on option enable if it's in the offhand --- packs/BP/scripts/options/easyPlace.js | 3 ++- packs/BP/scripts/options/fastEasyPlace.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packs/BP/scripts/options/easyPlace.js b/packs/BP/scripts/options/easyPlace.js index 0c92ad4..72ad84f 100644 --- a/packs/BP/scripts/options/easyPlace.js +++ b/packs/BP/scripts/options/easyPlace.js @@ -19,7 +19,8 @@ function giveActionItem(playerId) { const player = world.getEntity(playerId); const container = player.getComponent(EntityComponentTypes.Inventory)?.container; const itemStack = new ItemStack('construct:easy_place'); - if (!container.contains(itemStack)) { + const offhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Offhand); + if (!container.contains(itemStack) && offhandItemStack?.typeId !== 'construct:easy_place') { const remainingItemStack = container.addItem(itemStack); if (remainingItemStack) player.dimension.spawnItem(remainingItemStack, player.location); diff --git a/packs/BP/scripts/options/fastEasyPlace.js b/packs/BP/scripts/options/fastEasyPlace.js index 6dc3902..6917a83 100644 --- a/packs/BP/scripts/options/fastEasyPlace.js +++ b/packs/BP/scripts/options/fastEasyPlace.js @@ -23,7 +23,8 @@ function giveActionItem(playerId) { const player = world.getEntity(playerId); const container = player.getComponent(EntityComponentTypes.Inventory)?.container; const itemStack = new ItemStack('construct:easy_place'); - if (!container.contains(itemStack)) { + const offhandItemStack = player.getComponent(EntityComponentTypes.Equippable).getEquipment(EquipmentSlot.Offhand); + if (!container.contains(itemStack) && offhandItemStack?.typeId !== 'construct:easy_place') { const remainingItemStack = container.addItem(itemStack); if (remainingItemStack) player.dimension.spawnItem(remainingItemStack, player.location);