Fix dock sequence dock/undock notifications

- move Refinery dock/undock notifications to OnStateDock/-Undock
and only call Undock if Dock was also called.
- Add INotifyHarvesterAction support to VoxelHarvesterDockSequence.
This commit is contained in:
reaperrr
2020-11-14 13:31:38 +01:00
committed by abcdefg30
parent 6bba35c330
commit 05cb9b1fbf
3 changed files with 25 additions and 9 deletions

View File

@@ -11,6 +11,7 @@
using OpenRA.Mods.Cnc.Traits.Render;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Cnc.Activities
{
@@ -29,6 +30,10 @@ namespace OpenRA.Mods.Cnc.Activities
public override void OnStateDock(Actor self)
{
body.Docked = true;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Docked();
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Docked(Refinery, self);
if (spriteOverlay != null && !spriteOverlay.Visible)
{
@@ -57,12 +62,26 @@ namespace OpenRA.Mods.Cnc.Activities
dockingState = DockingState.Complete;
body.Docked = false;
spriteOverlay.Visible = false;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Undocked();
if (Refinery.IsInWorld && !Refinery.IsDead)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Undocked(Refinery, self);
});
}
else
{
dockingState = DockingState.Complete;
body.Docked = false;
foreach (var trait in self.TraitsImplementing<INotifyHarvesterAction>())
trait.Undocked();
if (Refinery.IsInWorld && !Refinery.IsDead)
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Undocked(Refinery, self);
}
}
}