diff --git a/OpenRa.Game/Traits/Mobile.cs b/OpenRa.Game/Traits/Mobile.cs index 244bdffd1c..d0ad28b242 100644 --- a/OpenRa.Game/Traits/Mobile.cs +++ b/OpenRa.Game/Traits/Mobile.cs @@ -54,8 +54,11 @@ namespace OpenRa.Traits public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) { if (mi.Button == MouseButton.Left) return null; + + // force-fire should *always* take precedence over move. + if (mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null; - if (underCursor != null) + if (underCursor != null && underCursor.Owner != null) { // force-move if (!mi.Modifiers.HasModifier(Modifiers.Alt)) return null;