Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed the Sender object from events. If you needed this field, add it to the event class.

Browse Source
This commit is contained in:
Acruid
2020-02-19 14:39:00 -08:00
parent c51533686b
commit e719745b10
15 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Server.GameObjects.EntitySystems
{
base.Initialize();
SubscribeEvent<ExamineSystemMessages.RequestExamineInfoMessage>((sender, ev) => ExamineInfoRequest(ev));
SubscribeEvent<ExamineSystemMessages.RequestExamineInfoMessage>(ExamineInfoRequest);
IoCManager.InjectDependencies(this);
}

4
Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.EntitySystems
InputCmdHandler.FromDelegate(CombatModeToggled));
}
private void SetCombatModeActiveHandler(object sender, SetCombatModeActiveMessage ev)
private void SetCombatModeActiveHandler(SetCombatModeActiveMessage ev)
{
if (!TryGetCombatComponent(ev, out var combatModeComponent))
return;
@@ -39,7 +39,7 @@ namespace Content.Server.GameObjects.EntitySystems
combatModeComponent.IsInCombatMode = ev.Active;
}
private void SetTargetZoneHandler(object sender, SetTargetZoneMessage ev)
private void SetTargetZoneHandler(SetTargetZoneMessage ev)
{
if (!TryGetCombatComponent(ev, out var combatModeComponent))
return;

2
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -65,7 +65,7 @@ namespace Content.Server.GameObjects.EntitySystems
base.Shutdown();
}
private static void HandleContainerModified(object sender, ContainerModifiedMessage args)
private static void HandleContainerModified(ContainerModifiedMessage args)
{
if (args.Container.Owner.TryGetComponent(out IHandsComponent handsComponent))
{

4
Content.Server/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -80,7 +80,7 @@ namespace Content.Server.GameObjects.EntitySystems
_audioSystem = EntitySystemManager.GetEntitySystem<AudioSystem>();
}
private static void PlayerAttached(object sender, PlayerAttachSystemMessage ev)
private static void PlayerAttached(PlayerAttachSystemMessage ev)
{
if (!ev.Entity.HasComponent<IMoverComponent>())
{
@@ -88,7 +88,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private static void PlayerDetached(object sender, PlayerDetachedSystemMessage ev)
private static void PlayerDetached(PlayerDetachedSystemMessage ev)
{
if(ev.Entity.HasComponent<PlayerInputMoverComponent>())
{

4
Content.Server/GameObjects/EntitySystems/StorageSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private static void HandleEntityRemovedFromContainer(object sender, EntRemovedFromContainerMessage message)
private static void HandleEntityRemovedFromContainer(EntRemovedFromContainerMessage message)
{
var oldParentEntity = message.Container.Owner;
@@ -39,7 +39,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
}
private static void HandleEntityInsertedIntoContainer(object sender, EntInsertedIntoContainerMessage message)
private static void HandleEntityInsertedIntoContainer(EntInsertedIntoContainerMessage message)
{
var oldParentEntity = message.Container.Owner;

4
Content.Server/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -20,8 +20,8 @@ namespace Content.Server.GameObjects.EntitySystems
{
base.Initialize();
SubscribeEvent<RequestVerbsMessage>((sender, ev) => RequestVerbs(ev));
SubscribeEvent<UseVerbMessage>((sender, ev) => UseVerb(ev));
SubscribeEvent<RequestVerbsMessage>(RequestVerbs);
SubscribeEvent<UseVerbMessage>(UseVerb);
IoCManager.InjectDependencies(this);
}