Merge pull request #7445 from jwbuurlage/bleed

Fixes #7219. In addition, sets cursor corresponding to the order with hi...

AUTHORS

@@ -55,6 +55,7 @@ Also thanks to:
     * Iran
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -79,12 +79,13 @@ namespace OpenRA.Orders
 				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
 			}
 
-			var orders = world.Selection.Actors
+			var ordersWithCursor = world.Selection.Actors
 				.Select(a => OrderForUnit(a, target, mi))
-				.Where(o => o != null);
+				.Where(o => o != null && o.Cursor != null);
 
-			var cursorName = orders.Select(o => o.Cursor).FirstOrDefault();
-			return cursorName ?? (useSelect ? "select" : "default");
+			var cursorOrder = ordersWithCursor.MaxByOrDefault(o => o.Order.OrderPriority);
+
+			return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default");
 		}
 
 		static UnitOrderResult OrderForUnit(Actor self, Target target, MouseInput mi)

OpenRA.Mods.Common/Traits/Passenger.cs

@@ -117,10 +117,10 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			get
 			{
-				yield return new EnterTransportTargeter("EnterTransport", 6,
+				yield return new EnterTransportTargeter("EnterTransport", 5,
 					target => IsCorrectCargoType(target), target => CanEnter(target),
 					Info.AlternateTransportsMode);
-				yield return new EnterTransportsTargeter("EnterTransports", 6,
+				yield return new EnterTransportsTargeter("EnterTransports", 5,
 					target => IsCorrectCargoType(target), target => CanEnter(target),
 					Info.AlternateTransportsMode);
 			}