--- a/hedgewars/uGearsHandlersMess.pas	Mon Apr 01 19:27:13 2019 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Mon Apr 01 20:08:34 2019 +0200
@@ -3046,6 +3046,8 @@
 
     if (HHGear <> nil) then
         PlaySoundV(sndIncoming, Gear^.Hedgehog^.Team^.voicepack);
+    AfterAttack;
+    CurAmmoGear := nil;
 
     if Gear^.X.QWordValue = 0 then
         begin

--- a/hedgewars/uGearsHedgehog.pas	Mon Apr 01 19:27:13 2019 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Mon Apr 01 20:08:34 2019 +0200
@@ -530,6 +530,8 @@
                 amFlamethrower, amLandGun,
                  amResurrector, amTardis,
                        amPiano, amIceGun,
+                   amAirAttack, amNapalm,
+                  amMineStrike, amDrillStrike,
                       amRubber, amMinigun: CurAmmoGear:= newGear;
             end;
             if CurAmmoType = amCake then FollowGear:= newGear;