diff --git a/OpenRA.Game/Activities/Activity.cs b/OpenRA.Game/Activities/Activity.cs
index d9aa2a149e..2d796bf124 100644
--- a/OpenRA.Game/Activities/Activity.cs
+++ b/OpenRA.Game/Activities/Activity.cs
@@ -82,7 +82,13 @@ namespace OpenRA.Activities
return ret;
}
- public abstract Activity Tick(Actor self);
+ ///
+ /// Runs every timestep as long as this activity is active.
+ ///
+ public virtual Activity Tick(Actor self)
+ {
+ return NextActivity;
+ }
///
/// Runs once immediately before the first Tick() execution.
diff --git a/OpenRA.Mods.Common/Activities/DeliverUnit.cs b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
index f4e3caa315..4f1e67ca5e 100644
--- a/OpenRA.Mods.Common/Activities/DeliverUnit.cs
+++ b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
@@ -50,12 +50,6 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new TakeOff(self));
}
- public override Activity Tick(Actor self)
- {
-
- return NextActivity;
- }
-
class ReleaseUnit : Activity
{
readonly Carryall carryall;
@@ -98,11 +92,6 @@ namespace OpenRA.Mods.Common.Activities
carryable.Detached(cargo);
});
}
-
- public override Activity Tick(Actor self)
- {
- return NextActivity;
- }
}
}
}
diff --git a/OpenRA.Mods.Common/Activities/Transform.cs b/OpenRA.Mods.Common/Activities/Transform.cs
index 99849bfcd0..682e8c4c2c 100644
--- a/OpenRA.Mods.Common/Activities/Transform.cs
+++ b/OpenRA.Mods.Common/Activities/Transform.cs
@@ -168,11 +168,5 @@ namespace OpenRA.Mods.Common.Activities
{
return new Order(orderString, newActor, target, true);
}
-
- public override Activity Tick(Actor self)
- {
- // Activity is a placeholder that should never run
- return NextActivity;
- }
}
}