--- a/hedgewars/uGearsHandlersMess.pas	Tue Sep 18 19:38:58 2018 -0400
+++ b/hedgewars/uGearsHandlersMess.pas	Wed Sep 19 09:31:06 2018 +0200
@@ -3268,7 +3268,7 @@
     with HHGear^ do
         begin
         State := State and (not gstAttacking);
-        Message := Message and (not gmAttack)
+        Message := Message and (not (gmAttack or gmSwitch))
         end
 end;