From 13cfd2468f5dd4d3b01bf2704fa0a3568957a0b9 Mon Sep 17 00:00:00 2001 From: xeon Date: Sat, 10 Feb 2024 14:51:20 +0300 Subject: [PATCH] Add dummy handler for AceAntiDataPush (annoying) --- .../Controllers/AchievementController.cs | 2 +- .../Controllers/DailyActivityController.cs | 2 +- GameServer/Controllers/Event/EventSystem.cs | 2 +- .../Controllers/ExchangeRewardController.cs | 2 +- .../Factory/EventHandlerFactory.cs | 20 +++++++++---------- .../Controllers/FriendSystemController.cs | 2 +- GameServer/Controllers/GachaController.cs | 2 +- .../InfluenceReputationController.cs | 2 +- GameServer/Controllers/InventoryController.cs | 2 +- GameServer/Controllers/LordGymController.cs | 2 +- GameServer/Controllers/RoguelikeController.cs | 2 +- GameServer/Controllers/RoleController.cs | 2 +- GameServer/Controllers/ShopController.cs | 2 +- .../Controllers/ThirdPartySdkController.cs | 18 +++++++++++++++++ GameServer/Controllers/TowerController.cs | 2 +- GameServer/Controllers/TutorialController.cs | 2 +- GameServer/Controllers/WorldController.cs | 2 +- GameServer/Controllers/WorldMapController.cs | 2 +- 18 files changed, 44 insertions(+), 26 deletions(-) create mode 100644 GameServer/Controllers/ThirdPartySdkController.cs diff --git a/GameServer/Controllers/AchievementController.cs b/GameServer/Controllers/AchievementController.cs index e951478..c6f00bb 100644 --- a/GameServer/Controllers/AchievementController.cs +++ b/GameServer/Controllers/AchievementController.cs @@ -8,7 +8,7 @@ internal class AchievementController : Controller { public AchievementController(PlayerSession session) : base(session) { - // AchievementMessageHandler. + // AchievementController. } [NetEvent(MessageId.AchievementInfoRequest)] diff --git a/GameServer/Controllers/DailyActivityController.cs b/GameServer/Controllers/DailyActivityController.cs index 24f5226..116c3ec 100644 --- a/GameServer/Controllers/DailyActivityController.cs +++ b/GameServer/Controllers/DailyActivityController.cs @@ -8,7 +8,7 @@ internal class DailyActivityController : Controller { public DailyActivityController(PlayerSession session) : base(session) { - // DailyActivityMessageHandler. + // DailyActivityController. } [NetEvent(MessageId.ActivityRequest)] diff --git a/GameServer/Controllers/Event/EventSystem.cs b/GameServer/Controllers/Event/EventSystem.cs index 262684e..27b2eb0 100644 --- a/GameServer/Controllers/Event/EventSystem.cs +++ b/GameServer/Controllers/Event/EventSystem.cs @@ -34,7 +34,7 @@ internal class EventSystem _logger.LogInformation("Event {type} emitted", eventType); } - public static ImmutableDictionary> RegisterModelManagerEvents() + private static ImmutableDictionary> RegisterModelManagerEvents() { var builder = ImmutableDictionary.CreateBuilder>(); diff --git a/GameServer/Controllers/ExchangeRewardController.cs b/GameServer/Controllers/ExchangeRewardController.cs index 6aae076..eae8864 100644 --- a/GameServer/Controllers/ExchangeRewardController.cs +++ b/GameServer/Controllers/ExchangeRewardController.cs @@ -8,7 +8,7 @@ internal class ExchangeRewardController : Controller { public ExchangeRewardController(PlayerSession session) : base(session) { - // ExchangeRewardMessageHandler. + // ExchangeRewardController. } [NetEvent(MessageId.ExchangeRewardInfoRequest)] diff --git a/GameServer/Controllers/Factory/EventHandlerFactory.cs b/GameServer/Controllers/Factory/EventHandlerFactory.cs index 4e35ae6..9aff994 100644 --- a/GameServer/Controllers/Factory/EventHandlerFactory.cs +++ b/GameServer/Controllers/Factory/EventHandlerFactory.cs @@ -14,36 +14,36 @@ namespace GameServer.Controllers.Factory; internal delegate Task GameEventHandler(IServiceProvider serviceProvider); internal class EventHandlerFactory { - private readonly ImmutableDictionary s_rpcHandlers; - private readonly ImmutableDictionary s_pushHandlers; - private readonly ImmutableDictionary> s_eventHandlers; + private readonly ImmutableDictionary _rpcHandlers; + private readonly ImmutableDictionary _pushHandlers; + private readonly ImmutableDictionary> _eventHandlers; public EventHandlerFactory(ILogger logger) { IEnumerable controllerTypes = Assembly.GetExecutingAssembly().GetTypes() .Where(t => t.IsAssignableTo(typeof(Controller)) && !t.IsAbstract); - s_rpcHandlers = RegisterRpcHandlers(controllerTypes); - s_pushHandlers = RegisterPushHandlers(controllerTypes); - s_eventHandlers = RegisterEventHandlers(controllerTypes); - logger.LogInformation("Registered {rpc_count} rpc handlers, {push_count} push handlers", s_rpcHandlers.Count, s_pushHandlers.Count); + _rpcHandlers = RegisterRpcHandlers(controllerTypes); + _pushHandlers = RegisterPushHandlers(controllerTypes); + _eventHandlers = RegisterEventHandlers(controllerTypes); + logger.LogInformation("Registered {rpc_count} rpc handlers, {push_count} push handlers", _rpcHandlers.Count, _pushHandlers.Count); } public RpcHandler? GetRpcHandler(MessageId messageId) { - s_rpcHandlers.TryGetValue(messageId, out RpcHandler? handler); + _rpcHandlers.TryGetValue(messageId, out RpcHandler? handler); return handler; } public PushHandler? GetPushHandler(MessageId messageId) { - s_pushHandlers.TryGetValue(messageId, out PushHandler? handler); + _pushHandlers.TryGetValue(messageId, out PushHandler? handler); return handler; } public IEnumerable GetEventHandlers(GameEventType eventType) { - if (!s_eventHandlers.TryGetValue(eventType, out List? handlers)) + if (!_eventHandlers.TryGetValue(eventType, out List? handlers)) return []; return handlers; diff --git a/GameServer/Controllers/FriendSystemController.cs b/GameServer/Controllers/FriendSystemController.cs index cc6c0a4..681fc03 100644 --- a/GameServer/Controllers/FriendSystemController.cs +++ b/GameServer/Controllers/FriendSystemController.cs @@ -8,7 +8,7 @@ internal class FriendSystemController : Controller { public FriendSystemController(PlayerSession session) : base(session) { - // FriendMessageHandler. + // FriendController. } [NetEvent(MessageId.FriendAllRequest)] diff --git a/GameServer/Controllers/GachaController.cs b/GameServer/Controllers/GachaController.cs index 74deaef..4abb695 100644 --- a/GameServer/Controllers/GachaController.cs +++ b/GameServer/Controllers/GachaController.cs @@ -8,7 +8,7 @@ internal class GachaController : Controller { public GachaController(PlayerSession session) : base(session) { - // GachaMessageHandler. + // GachaController. } [NetEvent(MessageId.GachaInfoRequest)] diff --git a/GameServer/Controllers/InfluenceReputationController.cs b/GameServer/Controllers/InfluenceReputationController.cs index d9bde5c..4a50940 100644 --- a/GameServer/Controllers/InfluenceReputationController.cs +++ b/GameServer/Controllers/InfluenceReputationController.cs @@ -8,7 +8,7 @@ internal class InfluenceReputationController : Controller { public InfluenceReputationController(PlayerSession session) : base(session) { - // InfluenceReputationMessageHandler. + // InfluenceReputationController. } [NetEvent(MessageId.InfluenceInfoRequest)] diff --git a/GameServer/Controllers/InventoryController.cs b/GameServer/Controllers/InventoryController.cs index 4643637..1219cba 100644 --- a/GameServer/Controllers/InventoryController.cs +++ b/GameServer/Controllers/InventoryController.cs @@ -8,7 +8,7 @@ internal class InventoryController : Controller { public InventoryController(PlayerSession session) : base(session) { - // InventoryMessageHandler. + // InventoryController. } [NetEvent(MessageId.NormalItemRequest)] diff --git a/GameServer/Controllers/LordGymController.cs b/GameServer/Controllers/LordGymController.cs index 8f80d7d..cf40b31 100644 --- a/GameServer/Controllers/LordGymController.cs +++ b/GameServer/Controllers/LordGymController.cs @@ -8,7 +8,7 @@ internal class LordGymController : Controller { public LordGymController(PlayerSession session) : base(session) { - // LordGymMessageHandler. + // LordGymController. } [NetEvent(MessageId.LordGymInfoRequest)] diff --git a/GameServer/Controllers/RoguelikeController.cs b/GameServer/Controllers/RoguelikeController.cs index aa00631..23ad8ac 100644 --- a/GameServer/Controllers/RoguelikeController.cs +++ b/GameServer/Controllers/RoguelikeController.cs @@ -8,7 +8,7 @@ internal class RoguelikeController : Controller { public RoguelikeController(PlayerSession session) : base(session) { - // RoguelikeMessageHandler. + // RoguelikeController. } [NetEvent(MessageId.RoguelikeSeasonDataRequest)] diff --git a/GameServer/Controllers/RoleController.cs b/GameServer/Controllers/RoleController.cs index ac1e429..af068c4 100644 --- a/GameServer/Controllers/RoleController.cs +++ b/GameServer/Controllers/RoleController.cs @@ -10,7 +10,7 @@ internal class RoleController : Controller { public RoleController(PlayerSession session) : base(session) { - // RoleMessageHandler. + // RoleController. } [GameEvent(GameEventType.EnterGame)] diff --git a/GameServer/Controllers/ShopController.cs b/GameServer/Controllers/ShopController.cs index 5fbeaa2..11edc99 100644 --- a/GameServer/Controllers/ShopController.cs +++ b/GameServer/Controllers/ShopController.cs @@ -8,7 +8,7 @@ internal class ShopController : Controller { public ShopController(PlayerSession session) : base(session) { - // ShopMessageHandler. + // ShopController. } [NetEvent(MessageId.PayShopInfoRequest)] diff --git a/GameServer/Controllers/ThirdPartySdkController.cs b/GameServer/Controllers/ThirdPartySdkController.cs new file mode 100644 index 0000000..24e8107 --- /dev/null +++ b/GameServer/Controllers/ThirdPartySdkController.cs @@ -0,0 +1,18 @@ +using GameServer.Controllers.Attributes; +using GameServer.Network; +using Protocol; + +namespace GameServer.Controllers; +internal class ThirdPartySdkController : Controller +{ + public ThirdPartySdkController(PlayerSession session) : base(session) + { + // ThirdPartySdkController. + } + + [NetEvent(MessageId.AceAntiDataPush)] + public void OnAceAntiDataPush() + { + // This is just annoying. + } +} diff --git a/GameServer/Controllers/TowerController.cs b/GameServer/Controllers/TowerController.cs index 435cbea..7448b62 100644 --- a/GameServer/Controllers/TowerController.cs +++ b/GameServer/Controllers/TowerController.cs @@ -8,7 +8,7 @@ internal class TowerController : Controller { public TowerController(PlayerSession session) : base(session) { - // TowerMessageHandler. + // TowerController. } [NetEvent(MessageId.TowerChallengeRequest)] diff --git a/GameServer/Controllers/TutorialController.cs b/GameServer/Controllers/TutorialController.cs index 20496f7..37203f7 100644 --- a/GameServer/Controllers/TutorialController.cs +++ b/GameServer/Controllers/TutorialController.cs @@ -8,7 +8,7 @@ internal class TutorialController : Controller { public TutorialController(PlayerSession session) : base(session) { - // TutorialMessageHandler. + // TutorialController. } [NetEvent(MessageId.TutorialInfoRequest)] diff --git a/GameServer/Controllers/WorldController.cs b/GameServer/Controllers/WorldController.cs index 8d40041..8cde8c1 100644 --- a/GameServer/Controllers/WorldController.cs +++ b/GameServer/Controllers/WorldController.cs @@ -10,7 +10,7 @@ internal class WorldController : Controller { public WorldController(PlayerSession session) : base(session) { - // WorldMessageHandler. + // WorldController. } [GameEvent(GameEventType.EnterGame)] diff --git a/GameServer/Controllers/WorldMapController.cs b/GameServer/Controllers/WorldMapController.cs index 7398260..20dc0c7 100644 --- a/GameServer/Controllers/WorldMapController.cs +++ b/GameServer/Controllers/WorldMapController.cs @@ -8,7 +8,7 @@ internal class WorldMapController : Controller { public WorldMapController(PlayerSession session) : base(session) { - // WorldMapMessageHandler. + // WorldMapController. } [NetEvent(MessageId.MapTraceInfoRequest)]