From f7c6a2ad289891ed96f8718fd5b50b92a09a8091 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 6 Mar 2024 15:02:48 -0500 Subject: [PATCH] v2.4.0: fixed empowered flurry of blows not using projecting enchant --- .../actors/buffs/MonkEnergy.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java index 946f2ec02..e7c03a53e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MonkEnergy.java @@ -341,17 +341,20 @@ public class MonkEnergy extends Buff implements ActionIndicator.Action { return; } + if (Buff.affect(hero, MonkEnergy.class).abilitiesEmpowered(hero)){ + Buff.affect(hero, FlurryEmpowerTracker.class, 0f); + } + UnarmedAbilityTracker tracker = Buff.affect(hero, UnarmedAbilityTracker.class); if (!hero.canAttack(enemy)){ GLog.w(Messages.get(MeleeWeapon.class, "ability_bad_position")); tracker.detach(); + if (hero.buff(FlurryEmpowerTracker.class) != null){ + hero.buff(FlurryEmpowerTracker.class).detach(); + } return; } - if (Buff.affect(hero, MonkEnergy.class).abilitiesEmpowered(hero)){ - Buff.affect(hero, FlurryEmpowerTracker.class, 0f); - } - hero.sprite.attack(enemy.pos, new Callback() { @Override public void call() {