--- a/hedgewars/uGearsHandlersMess.pas	Sun Jul 29 11:39:48 2018 -0400
+++ b/hedgewars/uGearsHandlersMess.pas	Mon Jul 30 13:20:01 2018 +0200
@@ -6227,6 +6227,9 @@
         exit
         end;
     updateFuel(Gear);
+    if WorldWrap(Gear) and (WorldEdge = weWrap) and (Gear^.Target.X = NoPointX) then
+        // Use FlightTime to count number of times the gear has world-wrapped
+        inc(Gear^.FlightTime);
 
     with Gear^ do
         begin
@@ -6240,6 +6243,7 @@
             begin
             updateTarget(Gear, ndX, ndY);
             Timer := iceWaitCollision;
+            FlightTime := 0;
             end
         else
             begin