diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs index 202f901220..854ba45bac 100644 --- a/OpenRA.Mods.Common/Traits/Cargo.cs +++ b/OpenRA.Mods.Common/Traits/Cargo.cs @@ -422,12 +422,6 @@ namespace OpenRA.Mods.Common.Traits } } - [RequireExplicitImplementation] - public interface INotifyPassengerEntered { void OnPassengerEntered(Actor self, Actor passenger); } - - [RequireExplicitImplementation] - public interface INotifyPassengerExited { void OnPassengerExited(Actor self, Actor passenger); } - public class RuntimeCargoInit : IActorInit, ISuppressInitExport { [FieldFromYamlKey] diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs index bc06006e5e..f41b29452d 100644 --- a/OpenRA.Mods.Common/TraitsInterfaces.cs +++ b/OpenRA.Mods.Common/TraitsInterfaces.cs @@ -60,6 +60,12 @@ namespace OpenRA.Mods.Common.Traits [RequireExplicitImplementation] public interface INotifyBlockingMove { void OnNotifyBlockingMove(Actor self, Actor blocking); } + [RequireExplicitImplementation] + public interface INotifyPassengerEntered { void OnPassengerEntered(Actor self, Actor passenger); } + + [RequireExplicitImplementation] + public interface INotifyPassengerExited { void OnPassengerExited(Actor self, Actor passenger); } + public interface IUpgradable { IEnumerable UpgradeTypes { get; }