]> git.deb.at Git - rhonda/impostor.git/commitdiff
Change all events to use interfaces and move them to a better namespace
authorAeonLucid <aeonlucid@outlook.com>
Mon, 26 Oct 2020 03:37:31 +0000 (04:37 +0100)
committerAeonLucid <aeonlucid@outlook.com>
Mon, 26 Oct 2020 03:37:42 +0000 (04:37 +0100)
58 files changed:
docs/Writing-a-plugin.md
src/.editorconfig
src/Impostor.Api/Events/Game/GameCreatedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/GameDestroyedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/GameEndedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/GameStartedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/GameStartingEvent.cs [deleted file]
src/Impostor.Api/Events/Game/IGameCreatedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGameDestroyedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGameEndedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGameEvent.cs
src/Impostor.Api/Events/Game/IGamePlayerJoinedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGamePlayerLeftEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGameStartedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/IGameStartingEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Meeting/IMeetingEndedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Meeting/IMeetingEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Meeting/IMeetingStartedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Meeting/MeetingEndedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/Meeting/MeetingStartedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/Player/IPlayerChatEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Player/IPlayerDestroyedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Player/IPlayerSpawnedEvent.cs [new file with mode: 0644]
src/Impostor.Api/Events/Game/Player/PlayerChatEvent.cs [deleted file]
src/Impostor.Api/Events/Game/Player/PlayerDestroyedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/Player/PlayerMovementEvent.cs [deleted file]
src/Impostor.Api/Events/Game/Player/PlayerSpawnedEvent.cs [deleted file]
src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs [deleted file]
src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs [deleted file]
src/Impostor.Plugins.Debugger/Pages/Index.razor
src/Impostor.Plugins.Example/Handlers/GameEventListener.cs
src/Impostor.Plugins.Example/Handlers/MeetingEventListener.cs
src/Impostor.Plugins.Example/Handlers/PlayerEventListener.cs
src/Impostor.Server/Events/EventManager.cs
src/Impostor.Server/Events/Game/GameCreatedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GameDestroyedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GameEndedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GamePlayerJoinedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GamePlayerLeftEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GameStartedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/GameStartingEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Meeting/MeetingEndedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Meeting/MeetingStartedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Player/PlayerChatEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Player/PlayerDestroyedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Player/PlayerMovementEvent.cs [new file with mode: 0644]
src/Impostor.Server/Events/Game/Player/PlayerSpawnedEvent.cs [new file with mode: 0644]
src/Impostor.Server/Impostor.Server.csproj.DotSettings
src/Impostor.Server/Net/Client.cs
src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
src/Impostor.Server/Net/Manager/ClientManager.cs
src/Impostor.Server/Net/Manager/GameManager.cs
src/Impostor.Server/Net/State/Game.Data.cs
src/Impostor.Server/Net/State/Game.Incoming.cs
src/Impostor.Server/Net/State/Game.Outgoing.cs
src/Impostor.Server/Net/State/Game.State.cs
src/Impostor.Server/Net/State/Game.cs

index 99e99a381bb2c5f47b0590348868cc349eedb83d..0cfdb26096f5620c0778f3538a232cbfed8889f7 100644 (file)
@@ -150,6 +150,7 @@ Create a new class called `GameEventListener`. Example code:
 
 ```csharp
 using Impostor.Api.Events;
+using Impostor.Api.Events.Player;
 using Microsoft.Extensions.Logging;
 
 namespace Impostor.Plugins.Example.Handlers
@@ -176,7 +177,7 @@ namespace Impostor.Plugins.Example.Handlers
         ///     The event you want to listen for.
         /// </param>
         [EventListener]
-        public void OnGameStarted(GameStartedEvent e)
+        public void OnGameStarted(IGameStartedEvent e)
         {
             _logger.LogInformation($"Game is starting.");
 
@@ -197,13 +198,13 @@ namespace Impostor.Plugins.Example.Handlers
         }
 
         [EventListener]
-        public void OnGameEnded(GameEndedEvent e)
+        public void OnGameEnded(IGameEndedEvent e)
         {
             _logger.LogInformation($"Game has ended.");
         }
 
         [EventListener]
-        public void OnPlayerChat(PlayerChatEvent e)
+        public void OnPlayerChat(IPlayerChatEvent e)
         {
             _logger.LogInformation($"{e.PlayerControl.PlayerInfo.PlayerName} said {e.Message}");
         }
index d88593122c01fdc5af914fea4fffecf478d85853..ef7041d326cf018cbc67a47bc68a988adaf5476f 100644 (file)
@@ -11,6 +11,7 @@ indent_style = space
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
+insert_final_newline = true
 
 # XML project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
diff --git a/src/Impostor.Api/Events/Game/GameCreatedEvent.cs b/src/Impostor.Api/Events/Game/GameCreatedEvent.cs
deleted file mode 100644 (file)
index dc96fae..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called whenever a new <see cref="IGame"/> is created.
-    /// </summary>
-    public sealed class GameCreatedEvent : IGameEvent
-    {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GameCreatedEvent"/> class.
-        /// </summary>
-        /// <param name="game">Instance of the game.</param>
-        public GameCreatedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/GameDestroyedEvent.cs b/src/Impostor.Api/Events/Game/GameDestroyedEvent.cs
deleted file mode 100644 (file)
index 36fec11..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called whenever a new <see cref="IGame"/> is destroyed.
-    /// </summary>
-    public sealed class GameDestroyedEvent : IGameEvent
-    {
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="GameDestroyedEvent"/> class.
-        /// </summary>
-        /// <param name="game">Instance of the game.</param>
-        public GameDestroyedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/GameEndedEvent.cs b/src/Impostor.Api/Events/Game/GameEndedEvent.cs
deleted file mode 100644 (file)
index 1dc2f63..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    public class GameEndedEvent : IGameEvent
-    {
-        public GameEndedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/GameStartedEvent.cs b/src/Impostor.Api/Events/Game/GameStartedEvent.cs
deleted file mode 100644 (file)
index 12311a3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     The game is started here and players have been initialized.
-    /// </summary>
-    public class GameStartedEvent : IGameEvent
-    {
-        public GameStartedEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/GameStartingEvent.cs b/src/Impostor.Api/Events/Game/GameStartingEvent.cs
deleted file mode 100644 (file)
index b60d007..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-using Impostor.Api.Games;
-
-namespace Impostor.Api.Events
-{
-    /// <summary>
-    ///     Called when the game is going to start.
-    ///     When this is called, not all players are initialized properly yet.
-    ///     If you want to get correct player states, use <see cref="GameStartedEvent"/>.
-    /// </summary>
-    public class GameStartingEvent : IGameEvent
-    {
-        public GameStartingEvent(IGame game)
-        {
-            Game = game;
-        }
-
-        public IGame Game { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/IGameCreatedEvent.cs b/src/Impostor.Api/Events/Game/IGameCreatedEvent.cs
new file mode 100644 (file)
index 0000000..ef45f1d
--- /dev/null
@@ -0,0 +1,11 @@
+using Impostor.Api.Games;
+
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called whenever a new <see cref="IGame"/> is created.
+    /// </summary>
+    public interface IGameCreatedEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/IGameDestroyedEvent.cs b/src/Impostor.Api/Events/Game/IGameDestroyedEvent.cs
new file mode 100644 (file)
index 0000000..7ff7b46
--- /dev/null
@@ -0,0 +1,11 @@
+using Impostor.Api.Games;
+
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called whenever a new <see cref="IGame"/> is destroyed.
+    /// </summary>
+    public interface IGameDestroyedEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/IGameEndedEvent.cs b/src/Impostor.Api/Events/Game/IGameEndedEvent.cs
new file mode 100644 (file)
index 0000000..215852c
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGameEndedEvent : IGameEvent
+    {
+    }
+}
index 4aacd18480ab5ec8a09fdc0d1b40a2fd783e1311..c9ae5790d7877590ee041161929a1490ee0e5d88 100644 (file)
@@ -4,6 +4,9 @@ namespace Impostor.Api.Events
 {
     public interface IGameEvent : IEvent
     {
+        /// <summary>
+        ///     Gets the <see cref="IGame"/> this event belongs to.
+        /// </summary>
         IGame Game { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Impostor.Api/Events/Game/IGamePlayerJoinedEvent.cs b/src/Impostor.Api/Events/Game/IGamePlayerJoinedEvent.cs
new file mode 100644 (file)
index 0000000..921568e
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGamePlayerJoinedEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/IGamePlayerLeftEvent.cs b/src/Impostor.Api/Events/Game/IGamePlayerLeftEvent.cs
new file mode 100644 (file)
index 0000000..21d8b7c
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events
+{
+    public interface IGamePlayerLeftEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/IGameStartedEvent.cs b/src/Impostor.Api/Events/Game/IGameStartedEvent.cs
new file mode 100644 (file)
index 0000000..b6e5111
--- /dev/null
@@ -0,0 +1,9 @@
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     The game is started here and players have been initialized.
+    /// </summary>
+    public interface IGameStartedEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/IGameStartingEvent.cs b/src/Impostor.Api/Events/Game/IGameStartingEvent.cs
new file mode 100644 (file)
index 0000000..5998bf2
--- /dev/null
@@ -0,0 +1,11 @@
+namespace Impostor.Api.Events
+{
+    /// <summary>
+    ///     Called when the game is going to start.
+    ///     When this is called, not all players are initialized properly yet.
+    ///     If you want to get correct player states, use <see cref="IGameStartedEvent"/>.
+    /// </summary>
+    public interface IGameStartingEvent : IGameEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Meeting/IMeetingEndedEvent.cs b/src/Impostor.Api/Events/Game/Meeting/IMeetingEndedEvent.cs
new file mode 100644 (file)
index 0000000..a217580
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingEndedEvent : IMeetingEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Meeting/IMeetingEvent.cs b/src/Impostor.Api/Events/Game/Meeting/IMeetingEvent.cs
new file mode 100644 (file)
index 0000000..4461318
--- /dev/null
@@ -0,0 +1,9 @@
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingEvent : IGameEvent
+    {
+        IInnerMeetingHud MeetingHud { get; }
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Meeting/IMeetingStartedEvent.cs b/src/Impostor.Api/Events/Game/Meeting/IMeetingStartedEvent.cs
new file mode 100644 (file)
index 0000000..a237fff
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Meeting
+{
+    public interface IMeetingStartedEvent : IMeetingEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Meeting/MeetingEndedEvent.cs b/src/Impostor.Api/Events/Game/Meeting/MeetingEndedEvent.cs
deleted file mode 100644 (file)
index 2586c0b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Meeting
-{
-    public class MeetingEndedEvent : IEvent
-    {
-        public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud)
-        {
-            Game = game;
-            MeetingHud = meetingHud;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerMeetingHud MeetingHud { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/Meeting/MeetingStartedEvent.cs b/src/Impostor.Api/Events/Game/Meeting/MeetingStartedEvent.cs
deleted file mode 100644 (file)
index 8ad8964..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Meeting
-{
-    public class MeetingStartedEvent : IEvent
-    {
-        public MeetingStartedEvent(IGame game, IInnerMeetingHud meetingHud)
-        {
-            Game = game;
-            MeetingHud = meetingHud;
-        }
-
-        public IGame Game { get; }
-
-        public IInnerMeetingHud MeetingHud { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/Player/IPlayerChatEvent.cs b/src/Impostor.Api/Events/Game/Player/IPlayerChatEvent.cs
new file mode 100644 (file)
index 0000000..52efe96
--- /dev/null
@@ -0,0 +1,10 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerChatEvent : IPlayerEvent
+    {
+        /// <summary>
+        ///     Gets the message sent by the player.
+        /// </summary>
+        string Message { get; }
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Player/IPlayerDestroyedEvent.cs b/src/Impostor.Api/Events/Game/Player/IPlayerDestroyedEvent.cs
new file mode 100644 (file)
index 0000000..ac80d64
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerDestroyedEvent : IPlayerEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Player/IPlayerSpawnedEvent.cs b/src/Impostor.Api/Events/Game/Player/IPlayerSpawnedEvent.cs
new file mode 100644 (file)
index 0000000..a3be654
--- /dev/null
@@ -0,0 +1,6 @@
+namespace Impostor.Api.Events.Player
+{
+    public interface IPlayerSpawnedEvent : IPlayerEvent
+    {
+    }
+}
diff --git a/src/Impostor.Api/Events/Game/Player/PlayerChatEvent.cs b/src/Impostor.Api/Events/Game/Player/PlayerChatEvent.cs
deleted file mode 100644 (file)
index 5be360c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Player
-{
-    public class PlayerChatEvent : IPlayerEvent
-    {
-        public PlayerChatEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl, string message)
-        {
-            Game = game;
-            ClientPlayer = clientPlayer;
-            PlayerControl = playerControl;
-            Message = message;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-
-        /// <inheritdoc/>
-        public IClientPlayer ClientPlayer { get; }
-
-        /// <inheritdoc/>
-        public IInnerPlayerControl PlayerControl { get; }
-
-        /// <summary>
-        ///     Gets the message sent by the player.
-        /// </summary>
-        public string Message { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/Player/PlayerDestroyedEvent.cs b/src/Impostor.Api/Events/Game/Player/PlayerDestroyedEvent.cs
deleted file mode 100644 (file)
index dc4b608..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Player
-{
-    public class PlayerDestroyedEvent : IPlayerEvent
-    {
-        public PlayerDestroyedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
-        {
-            Game = game;
-            ClientPlayer = clientPlayer;
-            PlayerControl = playerControl;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-
-        /// <inheritdoc/>
-        public IClientPlayer ClientPlayer { get; }
-
-        /// <inheritdoc/>
-        public IInnerPlayerControl PlayerControl { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/Player/PlayerMovementEvent.cs b/src/Impostor.Api/Events/Game/Player/PlayerMovementEvent.cs
deleted file mode 100644 (file)
index 7fa0085..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// using Impostor.Api.Games;
-// using Impostor.Api.Net;
-// using Impostor.Api.Net.Inner.Objects;
-//
-// namespace Impostor.Api.Events.Player
-// {
-//     public class PlayerMovementEvent : IPlayerEvent
-//     {
-//         public PlayerMovementEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
-//         {
-//             Game = game;
-//             ClientPlayer = clientPlayer;
-//             PlayerControl = playerControl;
-//         }
-//
-//         public IGame Game { get; }
-//
-//         public IClientPlayer ClientPlayer { get; }
-//
-//         public IInnerPlayerControl PlayerControl { get; }
-//     }
-// }
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/Player/PlayerSpawnedEvent.cs b/src/Impostor.Api/Events/Game/Player/PlayerSpawnedEvent.cs
deleted file mode 100644 (file)
index 2078f04..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-using Impostor.Api.Net.Inner.Objects;
-
-namespace Impostor.Api.Events.Player
-{
-    public class PlayerSpawnedEvent : IPlayerEvent
-    {
-        public PlayerSpawnedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
-        {
-            Game = game;
-            ClientPlayer = clientPlayer;
-            PlayerControl = playerControl;
-        }
-
-        /// <inheritdoc/>
-        public IGame Game { get; }
-
-        /// <inheritdoc/>
-        public IClientPlayer ClientPlayer { get; }
-
-        /// <inheritdoc/>
-        public IInnerPlayerControl PlayerControl { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs b/src/Impostor.Api/Events/Game/PlayerJoinedGameEvent.cs
deleted file mode 100644 (file)
index 3c165aa..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerJoinedGameEvent : IGameEvent
-    {
-        public PlayerJoinedGameEvent(IGame game, IClientPlayer player)
-        {
-            Game = game;
-            Player = player;
-        }
-
-        public IGame Game { get; }
-
-        public IClientPlayer Player { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs b/src/Impostor.Api/Events/Game/PlayerLeftGameEvent.cs
deleted file mode 100644 (file)
index 5947ff2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-using Impostor.Api.Games;
-using Impostor.Api.Net;
-
-namespace Impostor.Api.Events
-{
-    public class PlayerLeftGameEvent : IGameEvent
-    {
-        public PlayerLeftGameEvent(IGame game, IClientPlayer player, bool isBan)
-        {
-            Game = game;
-            Player = player;
-            IsBan = isBan;
-        }
-
-        public IGame Game { get; }
-
-        public IClientPlayer Player { get; }
-
-        public bool IsBan { get; }
-    }
-}
\ No newline at end of file
index 5548dbbac74aa9dfcc95d4b98fc6d1c4f84d7d6d..1bfa47807a4caf1a0fcb87411732c6d254b11e88 100644 (file)
 @code {
     private IDisposable _disposable;
 
-    [EventListener(typeof(GameCreatedEvent))]
-    [EventListener(typeof(GameDestroyedEvent))]
-    [EventListener(typeof(PlayerJoinedGameEvent))]
-    [EventListener(typeof(PlayerLeftGameEvent))]
+    [EventListener(typeof(IGameCreatedEvent))]
+    [EventListener(typeof(IGameDestroyedEvent))]
+    [EventListener(typeof(IGamePlayerJoinedEvent))]
+    [EventListener(typeof(IGamePlayerLeftEvent))]
     public void OnGameCreated(IGameEvent e)
     {
         StateHasChanged();
index 89947aa7452b50092fa3ad18e6c82a4c94aae91f..409ec4fb201054a1f26d25bd24de09827c89042f 100644 (file)
@@ -1,25 +1,24 @@
 using System;
 using Impostor.Api.Events;
-using Impostor.Api.Events.Player;
 
 namespace Impostor.Plugins.Example.Handlers
 {
     public class GameEventListener : IEventListener
     {
         [EventListener]
-        public void OnGameCreated(GameCreatedEvent e)
+        public void OnGameCreated(IGameCreatedEvent e)
         {
             Console.WriteLine("Game > created");
         }
 
         [EventListener]
-        public void OnGameStarting(GameStartingEvent e)
+        public void OnGameStarting(IGameStartingEvent e)
         {
             Console.WriteLine("Game > starting");
         }
 
         [EventListener]
-        public void OnGameStarted(GameStartedEvent e)
+        public void OnGameStarted(IGameStartedEvent e)
         {
             Console.WriteLine("Game > started");
 
@@ -32,27 +31,27 @@ namespace Impostor.Plugins.Example.Handlers
         }
 
         [EventListener]
-        public void OnGameEnded(GameEndedEvent e)
+        public void OnGameEnded(IGameEndedEvent e)
         {
             Console.WriteLine("Game > ended");
         }
 
         [EventListener]
-        public void OnGameDestroyed(GameDestroyedEvent e)
+        public void OnGameDestroyed(IGameDestroyedEvent e)
         {
             Console.WriteLine("Game > destroyed");
         }
 
         [EventListener]
-        public void OnPlayerJoined(PlayerJoinedGameEvent e)
+        public void OnPlayerJoined(IGamePlayerJoinedEvent e)
         {
             Console.WriteLine("Player joined a game.");
         }
 
         [EventListener]
-        public void OnPlayerLeftGame(PlayerLeftGameEvent e)
+        public void OnPlayerLeftGame(IGamePlayerLeftEvent e)
         {
             Console.WriteLine("Player left a game.");
         }
     }
-}
\ No newline at end of file
+}
index fffa3a596f981d544ab91985eafed4fdc684caef..847532c5044e1fbb7beb3881c6b7a77d305d39ee 100644 (file)
@@ -7,15 +7,15 @@ namespace Impostor.Plugins.Example.Handlers
     public class MeetingEventListener : IEventListener
     {
         [EventListener]
-        public void OnMeetingStarted(MeetingStartedEvent e)
+        public void OnMeetingStarted(IMeetingStartedEvent e)
         {
             Console.WriteLine("Meeting > started");
         }
 
         [EventListener]
-        public void OnMeetingEnded(MeetingEndedEvent e)
+        public void OnMeetingEnded(IMeetingEndedEvent e)
         {
             Console.WriteLine("Meeting > ended");
         }
     }
-}
\ No newline at end of file
+}
index 50536a86f583d29c1e79e83a504a08385953dbb5..2b1b13014593caf13b457c0cdeb9952458fc5d95 100644 (file)
@@ -8,19 +8,19 @@ namespace Impostor.Plugins.Example.Handlers
     public class PlayerEventListener : IEventListener
     {
         [EventListener]
-        public void OnPlayerSpawned(PlayerSpawnedEvent e)
+        public void OnPlayerSpawned(IPlayerSpawnedEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " spawned");
         }
 
         [EventListener]
-        public void OnPlayerDestroyed(PlayerDestroyedEvent e)
+        public void OnPlayerDestroyed(IPlayerDestroyedEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " destroyed");
         }
 
         [EventListener]
-        public async ValueTask OnPlayerChat(PlayerChatEvent e)
+        public async ValueTask OnPlayerChat(IPlayerChatEvent e)
         {
             Console.WriteLine(e.PlayerControl.PlayerInfo.PlayerName + " said " + e.Message);
 
@@ -37,4 +37,4 @@ namespace Impostor.Plugins.Example.Handlers
             await e.PlayerControl.SendChatAsync(e.Message);
         }
     }
-}
\ No newline at end of file
+}
index 6147e2fc7382b810fa52eae102dcd9d0ca0ac6c4..b39632e18d3a8f7c25f8c14e9a673b5dacfb86f1 100644 (file)
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
@@ -88,6 +89,16 @@ namespace Impostor.Server.Events
         private IEnumerable<EventHandler> GetHandlers<TEvent>(IServiceProvider services)
             where TEvent : IEvent
         {
+            var eventType = typeof(TEvent);
+            var interfaces = eventType.GetInterfaces();
+            if (interfaces.Length > 0 && _temporaryEventListeners.TryGetValue(interfaces[0], out var cb))
+            {
+                foreach (var eventListener in cb.GetEventListeners())
+                {
+                    yield return new EventHandler(null, eventListener);
+                }
+            }
+
             foreach (var handler in services.GetServices<IEventListener>())
             {
                 if (handler is IManualEventListener manualEventListener && manualEventListener.CanExecute<TEvent>())
@@ -109,7 +120,7 @@ namespace Impostor.Server.Events
                 }
             }
 
-            if (_temporaryEventListeners.TryGetValue(typeof(TEvent), out var cb))
+            if (_temporaryEventListeners.TryGetValue(eventType, out cb))
             {
                 foreach (var eventListener in cb.GetEventListeners())
                 {
diff --git a/src/Impostor.Server/Events/Game/GameCreatedEvent.cs b/src/Impostor.Server/Events/Game/GameCreatedEvent.cs
new file mode 100644 (file)
index 0000000..57e7a20
--- /dev/null
@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameCreatedEvent : IGameCreatedEvent
+    {
+        public GameCreatedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GameDestroyedEvent.cs b/src/Impostor.Server/Events/Game/GameDestroyedEvent.cs
new file mode 100644 (file)
index 0000000..5ee1b11
--- /dev/null
@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameDestroyedEvent : IGameDestroyedEvent
+    {
+        public GameDestroyedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GameEndedEvent.cs b/src/Impostor.Server/Events/Game/GameEndedEvent.cs
new file mode 100644 (file)
index 0000000..621b581
--- /dev/null
@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameEndedEvent : IGameEndedEvent
+    {
+        public GameEndedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GamePlayerJoinedEvent.cs b/src/Impostor.Server/Events/Game/GamePlayerJoinedEvent.cs
new file mode 100644 (file)
index 0000000..d728c59
--- /dev/null
@@ -0,0 +1,19 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+
+namespace Impostor.Server.Events
+{
+    public class GamePlayerJoinedEvent : IGamePlayerJoinedEvent
+    {
+        public GamePlayerJoinedEvent(IGame game, IClientPlayer player)
+        {
+            Game = game;
+            Player = player;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer Player { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GamePlayerLeftEvent.cs b/src/Impostor.Server/Events/Game/GamePlayerLeftEvent.cs
new file mode 100644 (file)
index 0000000..d295103
--- /dev/null
@@ -0,0 +1,22 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+
+namespace Impostor.Server.Events
+{
+    public class GamePlayerLeftEvent : IGamePlayerLeftEvent
+    {
+        public GamePlayerLeftEvent(IGame game, IClientPlayer player, bool isBan)
+        {
+            Game = game;
+            Player = player;
+            IsBan = isBan;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer Player { get; }
+
+        public bool IsBan { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GameStartedEvent.cs b/src/Impostor.Server/Events/Game/GameStartedEvent.cs
new file mode 100644 (file)
index 0000000..d21f9ec
--- /dev/null
@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameStartedEvent : IGameStartedEvent
+    {
+        public GameStartedEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/GameStartingEvent.cs b/src/Impostor.Server/Events/Game/GameStartingEvent.cs
new file mode 100644 (file)
index 0000000..a0763e8
--- /dev/null
@@ -0,0 +1,15 @@
+using Impostor.Api.Events;
+using Impostor.Api.Games;
+
+namespace Impostor.Server.Events
+{
+    public class GameStartingEvent : IGameStartingEvent
+    {
+        public GameStartingEvent(IGame game)
+        {
+            Game = game;
+        }
+
+        public IGame Game { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Meeting/MeetingEndedEvent.cs b/src/Impostor.Server/Events/Game/Meeting/MeetingEndedEvent.cs
new file mode 100644 (file)
index 0000000..cf55f7d
--- /dev/null
@@ -0,0 +1,19 @@
+using Impostor.Api.Events.Meeting;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Meeting
+{
+    public class MeetingEndedEvent : IMeetingEndedEvent
+    {
+        public MeetingEndedEvent(IGame game, IInnerMeetingHud meetingHud)
+        {
+            Game = game;
+            MeetingHud = meetingHud;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerMeetingHud MeetingHud { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Meeting/MeetingStartedEvent.cs b/src/Impostor.Server/Events/Game/Meeting/MeetingStartedEvent.cs
new file mode 100644 (file)
index 0000000..aa689a3
--- /dev/null
@@ -0,0 +1,19 @@
+using Impostor.Api.Events.Meeting;
+using Impostor.Api.Games;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Meeting
+{
+    public class MeetingStartedEvent : IMeetingStartedEvent
+    {
+        public MeetingStartedEvent(IGame game, IInnerMeetingHud meetingHud)
+        {
+            Game = game;
+            MeetingHud = meetingHud;
+        }
+
+        public IGame Game { get; }
+
+        public IInnerMeetingHud MeetingHud { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Player/PlayerChatEvent.cs b/src/Impostor.Server/Events/Game/Player/PlayerChatEvent.cs
new file mode 100644 (file)
index 0000000..7b7eb22
--- /dev/null
@@ -0,0 +1,26 @@
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Player
+{
+    public class PlayerChatEvent : IPlayerChatEvent
+    {
+        public PlayerChatEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl, string message)
+        {
+            Game = game;
+            ClientPlayer = clientPlayer;
+            PlayerControl = playerControl;
+            Message = message;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer ClientPlayer { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+
+        public string Message { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Player/PlayerDestroyedEvent.cs b/src/Impostor.Server/Events/Game/Player/PlayerDestroyedEvent.cs
new file mode 100644 (file)
index 0000000..69a20c9
--- /dev/null
@@ -0,0 +1,23 @@
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Player
+{
+    public class PlayerDestroyedEvent : IPlayerDestroyedEvent
+    {
+        public PlayerDestroyedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            ClientPlayer = clientPlayer;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer ClientPlayer { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Player/PlayerMovementEvent.cs b/src/Impostor.Server/Events/Game/Player/PlayerMovementEvent.cs
new file mode 100644 (file)
index 0000000..31ac388
--- /dev/null
@@ -0,0 +1,24 @@
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Player
+{
+    // TODO: Finish and use event, needs to be pooled
+    public class PlayerMovementEvent : IPlayerEvent
+    {
+        public PlayerMovementEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            ClientPlayer = clientPlayer;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer ClientPlayer { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}
diff --git a/src/Impostor.Server/Events/Game/Player/PlayerSpawnedEvent.cs b/src/Impostor.Server/Events/Game/Player/PlayerSpawnedEvent.cs
new file mode 100644 (file)
index 0000000..4b6fda1
--- /dev/null
@@ -0,0 +1,23 @@
+using Impostor.Api.Events.Player;
+using Impostor.Api.Games;
+using Impostor.Api.Net;
+using Impostor.Api.Net.Inner.Objects;
+
+namespace Impostor.Server.Events.Player
+{
+    public class PlayerSpawnedEvent : IPlayerSpawnedEvent
+    {
+        public PlayerSpawnedEvent(IGame game, IClientPlayer clientPlayer, IInnerPlayerControl playerControl)
+        {
+            Game = game;
+            ClientPlayer = clientPlayer;
+            PlayerControl = playerControl;
+        }
+
+        public IGame Game { get; }
+
+        public IClientPlayer ClientPlayer { get; }
+
+        public IInnerPlayerControl PlayerControl { get; }
+    }
+}
index 17962b139d098c85a7dd10251ac275a3c0be1674..5c07b47f6348bfbc3cf37a166d2b250b5b517e47 100644 (file)
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+       <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events_005Cgame/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
index 189ae4d4617bd9648b87fee14ad3b89895298583..b6fb09741052c83d6d8bcc7a03a647c4de811974 100644 (file)
@@ -9,7 +9,6 @@ using Impostor.Api.Net.Messages.C2S;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
 using Impostor.Server.Config;
-using Impostor.Server.Net.Hazel;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
index 29a803b3029e373dbf682e4c454edc98774bc2a1..941a4b3b52ad110286436772d0457f521a8db10f 100644 (file)
@@ -2,11 +2,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
-using Impostor.Api.Events.Meeting;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
+using Impostor.Server.Events.Meeting;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.Logging;
 
index c55f2ec4b8774ab7b75bcb303cc35b75d3314ac1..74aa531b53afd1e2622fc55b7e84365f46d1bd26 100644 (file)
@@ -1,13 +1,11 @@
 using System;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Inner.Objects;
 using Impostor.Api.Net.Messages;
+using Impostor.Server.Events.Player;
 using Impostor.Server.Net.Inner.Objects.Components;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.DependencyInjection;
index 96b2f54b8c1b67a9f51db1cc480c79640b90ee33..6309dabf569f9340c2cc3206f029396c3153f85a 100644 (file)
@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
-using Impostor.Api.Net.Manager;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
index 1cf68fa4196e0f0323883db77dca387a5cde3913..405ebc0eade9eba2cf1ce034f8b3b5c820addb1c 100644 (file)
@@ -5,12 +5,12 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Games.Managers;
 using Impostor.Api.Innersloth;
 using Impostor.Server.Config;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Redirector;
 using Impostor.Server.Net.State;
 using Microsoft.Extensions.DependencyInjection;
@@ -147,4 +147,4 @@ namespace Impostor.Server.Net.Manager
             await _eventManager.CallAsync(new GameDestroyedEvent(game));
         }
     }
-}
\ No newline at end of file
+}
index 3fd4b509e293e657455f4d53e230e4207c5f9050..d3eaff58c69d231a6091989011e966f0fa227975 100644 (file)
@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
-using Impostor.Api.Events.Meeting;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
+using Impostor.Server.Events.Meeting;
+using Impostor.Server.Events.Player;
 using Impostor.Server.Net.Inner;
 using Impostor.Server.Net.Inner.Objects;
 using Impostor.Server.Net.Inner.Objects.Components;
@@ -120,7 +119,7 @@ namespace Impostor.Server.Net.State
         {
             switch (netObj)
             {
-                case InnerLobbyBehaviour lobby:
+                case InnerLobbyBehaviour:
                 {
                     GameNet.LobbyBehaviour = null;
                     break;
index 7d81b360e8b28bd1b1dd959f11190b38cb1286f3..4ff9a63f844ccede40a3cff7a06e18a2882d5a40 100644 (file)
@@ -1,12 +1,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Impostor.Api.Events;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
+using Impostor.Server.Events;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
index 555216af7f9fca46c904221b2dc1490b3bec1d0b..cd8098f9b9e56a51a2fb0b0e21551f0dc859f3ea 100644 (file)
@@ -5,7 +5,6 @@ using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
 using Impostor.Hazel;
-using Impostor.Hazel.Udp;
 using Impostor.Server.Net.Inner;
 
 namespace Impostor.Server.Net.State
index c53a3d4b3596538b32414192f73bd5eccecdfcf0..e311776078ebb97b8c01a4f2408b427237bf0598 100644 (file)
@@ -1,12 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Api;
-using Impostor.Api.Events;
-using Impostor.Api.Events.Player;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Hazel;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Hazel;
 using Microsoft.Extensions.Logging;
 
@@ -29,7 +28,7 @@ namespace Impostor.Server.Net.State
                 await InitGameDataAsync(player);
             }
 
-            await _eventManager.CallAsync(new PlayerJoinedGameEvent(this, player));
+            await _eventManager.CallAsync(new GamePlayerJoinedEvent(this, player));
         }
 
         private async ValueTask<bool> PlayerRemove(int playerId, bool isBan = false)
@@ -73,7 +72,7 @@ namespace Impostor.Server.Net.State
                 BanIp(player.Client.Connection.EndPoint.Address);
             }
 
-            await _eventManager.CallAsync(new PlayerLeftGameEvent(this, player, isBan));
+            await _eventManager.CallAsync(new GamePlayerLeftEvent(this, player, isBan));
 
             // Player can refuse to be kicked and keep the connection open, check for this.
             _ = Task.Run(async () =>
index 7462cd6226aa5dc8c30ad6831cba27082f56b909..ed2049dab6638354343057c7cc621a393d643914 100644 (file)
@@ -4,13 +4,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Impostor.Api.Events;
 using Impostor.Api.Events.Managers;
 using Impostor.Api.Games;
 using Impostor.Api.Innersloth;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Messages;
 using Impostor.Api.Net.Messages.S2C;
+using Impostor.Server.Events;
 using Impostor.Server.Net.Manager;
 using Microsoft.Extensions.Logging;