v2.1.0: fixed bugs with action-stacking while using flurry

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java

@@ -388,14 +388,14 @@ public class SpiritBow extends Weapon {
 					}
 					return;
 				}
-				QuickSlotButton.target(enemy);
 
-				final boolean last = flurryCount == 1;
+				QuickSlotButton.target(enemy);
 				
 				user.busy();
 				
 				throwSound();
 
+				user.sprite.zap(cell);
 				((MissileSprite) user.sprite.parent.recycle(MissileSprite.class)).
 						reset(user.sprite,
 								cell,
@@ -408,27 +408,6 @@ public class SpiritBow extends Weapon {
 											onThrow(cell);
 										}
 
-										if (last) {
-											if (user.buff(Talent.LethalMomentumTracker.class) != null){
-												user.buff(Talent.LethalMomentumTracker.class).detach();
-												user.next();
-											} else {
-												user.spendAndNext(castDelay(user, dst));
-											}
-											sniperSpecial = false;
-											flurryCount = -1;
-										}
-
-										if (flurryActor != null){
-											flurryActor.next();
-											flurryActor = null;
-										}
-									}
-								});
-				
-				user.sprite.zap(cell, new Callback() {
-					@Override
-					public void call() {
 										flurryCount--;
 										if (flurryCount > 0){
 											Actor.add(new Actor() {
@@ -448,6 +427,20 @@ public class SpiritBow extends Weapon {
 												}
 											});
 											curUser.next();
+										} else {
+											if (user.buff(Talent.LethalMomentumTracker.class) != null){
+												user.buff(Talent.LethalMomentumTracker.class).detach();
+												user.next();
+											} else {
+												user.spendAndNext(castDelay(user, dst));
+											}
+											sniperSpecial = false;
+											flurryCount = -1;
+										}
+
+										if (flurryActor != null){
+											flurryActor.next();
+											flurryActor = null;
 										}
 									}
 								});