From 90103af925baf1b57db0388fcb444df07c6164fe Mon Sep 17 00:00:00 2001
From: Frank <fr13031997@gmail.com>
Date: Wed, 1 May 2024 12:27:34 +0200
Subject: [PATCH] Resolve ability the proper way

---
 src/data/move.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index 09630a3e3..a00e3b902 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -12,7 +12,7 @@ import * as Utils from "../utils";
 import { WeatherType } from "./weather";
 import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
 import { ArenaTagType } from "./enums/arena-tag-type";
-import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr, applyPostDefendAbAttrs, PostDefendContactApplyStatusEffectAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr } from "./ability";
+import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr, applyPostDefendAbAttrs, PostDefendContactApplyStatusEffectAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr, BlockItemTheftAbAttr } from "./ability";
 import { Abilities } from "./enums/abilities";
 import { allAbilities } from './ability';
 import { BerryModifier, PokemonHeldItemModifier } from "../modifier/modifier";
@@ -1093,15 +1093,18 @@ export class RemoveHeldBerryAttr extends MoveEffectAttr {
 
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
     return new Promise<boolean>(resolve => {
-      if (target.hasAbility(Abilities.STICKY_HOLD)) {
-        return resolve(false);
-      }
-      
       const heldBerries = this.getTargetHeldBerries(target).filter(b => b.getTransferrable(false))
 
       if (!heldBerries.length) {
         return resolve(false);
       }
+      
+      const cancelled = new Utils.BooleanHolder(false);
+      applyAbAttrs(BlockItemTheftAbAttr, target, cancelled);
+
+      if (cancelled.value) {
+        return resolve(false);
+      }
 
       const removedBerry = heldBerries[user.randSeedInt(heldBerries.length)];