epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clients acquiring hosts on order creations

Browse Source
This commit is contained in:
Gustas
2024-09-15 00:04:24 +03:00
committed by Paul Chote
parent d22bdbe944
commit b72d4ab7c6
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.Common/Activities/MoveToDock.cs
View File

@@ -24,16 +24,37 @@ namespace OpenRA.Mods.Common.Activities
IDockHost dockHost;
readonly INotifyDockClientMoving[] notifyDockClientMoving;
readonly MoveCooldownHelper moveCooldownHelper;
readonly bool forceEnter;
readonly bool ignoreOccupancy;
public MoveToDock(Actor self, Actor dockHostActor = null, IDockHost dockHost = null)
public MoveToDock(Actor self, Actor dockHostActor = null, IDockHost dockHost = null,
bool forceEnter = false, bool ignoreOccupancy = false)
{
dockClient = self.Trait<DockClientManager>();
this.dockHostActor = dockHostActor;
this.dockHost = dockHost;
this.forceEnter = forceEnter;
this.ignoreOccupancy = ignoreOccupancy;
notifyDockClientMoving = self.TraitsImplementing<INotifyDockClientMoving>().ToArray();
moveCooldownHelper = new MoveCooldownHelper(self.World, self.Trait<IMove>() as Mobile) { RetryIfDestinationBlocked = true };
}
protected override void OnFirstRun(Actor self)
{
if (IsCanceling || dockClient.IsTraitDisabled)
return;
// We were ordered to dock to an actor but host was unspecified.
if (dockHostActor != null && dockHost == null)
{
var link = dockClient.AvailableDockHosts(dockHostActor, default, forceEnter, ignoreOccupancy)
.ClosestDock(self, dockClient);
if (link.HasValue)
dockHost = link.Value.Trait;
}
}
public override bool Tick(Actor self)
{
if (IsCanceling)

15
OpenRA.Mods.Common/Traits/DockClientManager.cs
View File

@@ -177,16 +177,13 @@ namespace OpenRA.Mods.Common.Traits
if (target.Type != TargetType.Actor)
return;
if (IsTraitDisabled)
return;
self.QueueActivity(order.Queued, new MoveToDock(
self,
target.Actor,
null,
order.OrderString == "ForceDock",
true));
var dock = AvailableDockHosts(target.Actor, default, order.OrderString == "ForceDock", true)
.ClosestDock(self, this);
if (!dock.HasValue)
return;
self.QueueActivity(order.Queued, new MoveToDock(self, dock.Value.Actor, dock.Value.Trait));
self.ShowTargetLines();
}
}