From 6b5fcda1dd650eef620306de7c0df72504e81aa8 Mon Sep 17 00:00:00 2001 From: Lucca Faria Ferri Date: Mon, 6 Feb 2023 04:38:09 -0800 Subject: [PATCH] Small change. --- src/DiIiS-NA/BGS-Server/Base/BNetCodec.cs | 3 +- src/DiIiS-NA/BGS-Server/Base/BNetPacket.cs | 3 +- .../BGS-Server/Base/ConnectHandler.cs | 3 +- .../BGS-Server/Base/HandlerController.cs | 3 +- src/DiIiS-NA/BGS-Server/Base/RPCCallback.cs | 3 +- .../BGS-Server/Battle/BattleBackend.cs | 3 +- .../BGS-Server/Battle/PlayerManager.cs | 3 +- .../BGS-Server/ChannelSystem/Channel.cs | 3 +- .../ChannelSystem/ChannelInvitationManager.cs | 3 +- .../ChannelSystem/ChannelManager.cs | 3 +- .../BGS-Server/ChannelSystem/Member.cs | 3 +- src/DiIiS-NA/BGS-Server/Crypthography/ARC4.cs | 3 +- .../BGS-Server/Crypthography/SRP6a.cs | 3 +- .../BGS-Server/FriendsSystem/FriendManager.cs | 3 +- .../BGS-Server/FriendsSystem/UserManager.cs | 3 +- .../BGS-Server/GamesSystem/GameDescriptor.cs | 3 +- .../GamesSystem/GameFactoryManager.cs | 3 +- src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs | 3 +- .../BGS-Server/GuildSystem/GuildManager.cs | 3 +- .../BGS-Server/Helpers/EntityIdHelper.cs | 3 +- .../BGS-Server/Helpers/FieldKeyHelper.cs | 3 +- .../Helpers/NotificationTypeHelper.cs | 3 +- .../BGS-Server/Objects/PersistentRPCObject.cs | 3 +- .../BGS-Server/Objects/PresenceField.cs | 3 +- src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs | 3 +- .../BGS-Server/Objects/RPCObjectManager.cs | 3 +- .../BGS-Server/ServicesSystem/Service.cs | 3 +- .../ServicesSystem/Services/AccountService.cs | 3 +- .../Services/AuthenticationService.cs | 9 ++- .../Services/ChallengeService.cs | 3 +- .../Services/ChannelInvitationService.cs | 3 +- .../Services/ChannelMembershipService.cs | 3 +- .../Services/ChannelOwnerService.cs | 3 +- .../ServicesSystem/Services/ChannelService.cs | 3 +- .../Services/ConnectionSerivce.cs | 3 +- .../Services/GameMasterService.cs | 3 +- .../Services/GameRequestService.cs | 3 +- .../Services/GameUtilitiesService.cs | 4 +- .../Services/NotificationService.cs | 3 +- .../Services/PresenceService.cs | 3 +- .../Services/ResourceService.cs | 3 +- .../ServicesSystem/Services/SessionService.cs | 3 +- .../Services/SocialNetworkService.cs | 3 +- .../Services/UserManagerService.cs | 3 +- .../ServicesSystem/Services/WhisperService.cs | 3 +- src/DiIiS-NA/BGS-Server/Watchdog.cs | 3 +- src/DiIiS-NA/Core/Config/Config.cs | 4 +- src/DiIiS-NA/Core/Config/ConfigManager.cs | 3 +- .../Core/Extensions/ArrayExtensions.cs | 3 +- .../Core/Extensions/CodedOutputStream.cs | 3 +- .../Core/Extensions/DateTimeExtensions.cs | 3 +- .../Core/Extensions/IMessageExtensions.cs | 3 +- .../Core/Extensions/ListExtensions.cs | 3 +- .../Core/Extensions/StringExtensions.cs | 4 +- src/DiIiS-NA/Core/Extensions/Utilities.cs | 3 +- .../Core/Helpers/Hash/StringHashHelper.cs | 3 +- src/DiIiS-NA/Core/Helpers/IO/FileHelpers.cs | 3 +- src/DiIiS-NA/Core/Helpers/Math/FastRandom.cs | 3 +- src/DiIiS-NA/Core/Logging/AnsiTarget.cs | 8 +++ src/DiIiS-NA/Core/Logging/FileTarget.cs | 3 +- src/DiIiS-NA/Core/Logging/LogConfig.cs | 3 +- src/DiIiS-NA/Core/Logging/LogManager.cs | 3 +- src/DiIiS-NA/Core/Logging/LogRouter.cs | 3 +- src/DiIiS-NA/Core/Logging/LogTarget.cs | 3 +- src/DiIiS-NA/Core/Logging/Logger.cs | 3 +- src/DiIiS-NA/Core/MPQ/Asset.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Accolade.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Act.cs | 3 +- .../Core/MPQ/FileFormats/ActorData.cs | 3 +- .../Core/MPQ/FileFormats/Adventure.cs | 3 +- .../Core/MPQ/FileFormats/AmbientSound.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Anim.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/AnimSet.cs | 3 +- .../Core/MPQ/FileFormats/Animation2D.cs | 3 +- .../Core/MPQ/FileFormats/BossEncounter.cs | 3 +- .../Core/MPQ/FileFormats/Condition.cs | 3 +- .../Core/MPQ/FileFormats/Conversation.cs | 3 +- .../Core/MPQ/FileFormats/ConversationList.cs | 3 +- .../Core/MPQ/FileFormats/EffectGroup.cs | 3 +- .../Core/MPQ/FileFormats/Encounter.cs | 3 +- .../Core/MPQ/FileFormats/GameBalance.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Globals.cs | 3 +- .../Core/MPQ/FileFormats/LevelArea.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Lore.cs | 3 +- .../Core/MPQ/FileFormats/MarkerSet.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Observer.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/PhysMesh.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Power.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Quest.cs | 3 +- .../Core/MPQ/FileFormats/QuestRange.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Recipe.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Rope.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Scene.cs | 3 +- .../Core/MPQ/FileFormats/SceneGroup.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/SkillKit.cs | 3 +- .../Core/MPQ/FileFormats/TreasureClass.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Tutorial.cs | 3 +- .../Core/MPQ/FileFormats/Types/Common.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/Weather.cs | 3 +- src/DiIiS-NA/Core/MPQ/FileFormats/World.cs | 3 +- .../ClientSystem/ClientManager.cs | 15 +---- .../CommandManager/CommandManager.cs | 17 ++--- .../ActorSystem/Implementations/Banner.cs | 8 +-- .../PlayerSystem/ConversationManager.cs | 31 +-------- .../GSSystem/PlayerSystem/Player.cs | 64 +------------------ .../Implementations/HeroSkills/Barbarian.cs | 2 - .../PowerSystem/Payloads/DeathPayload.cs | 28 -------- src/DiIiS-NA/Program.cs | 15 ++--- src/DiIiS-NA/REST/RestSession.cs | 3 +- src/DiIiS-NA/REST/SocketBase.cs | 3 +- 110 files changed, 131 insertions(+), 369 deletions(-) diff --git a/src/DiIiS-NA/BGS-Server/Base/BNetCodec.cs b/src/DiIiS-NA/BGS-Server/Base/BNetCodec.cs index 2c62255..724963b 100644 --- a/src/DiIiS-NA/BGS-Server/Base/BNetCodec.cs +++ b/src/DiIiS-NA/BGS-Server/Base/BNetCodec.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using DotNetty.Codecs; using DotNetty.Buffers; using DotNetty.Codecs.Http.WebSockets; diff --git a/src/DiIiS-NA/BGS-Server/Base/BNetPacket.cs b/src/DiIiS-NA/BGS-Server/Base/BNetPacket.cs index cd4ae5e..bf3ee16 100644 --- a/src/DiIiS-NA/BGS-Server/Base/BNetPacket.cs +++ b/src/DiIiS-NA/BGS-Server/Base/BNetPacket.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using System; namespace DiIiS_NA.LoginServer.Base diff --git a/src/DiIiS-NA/BGS-Server/Base/ConnectHandler.cs b/src/DiIiS-NA/BGS-Server/Base/ConnectHandler.cs index c08680a..1546a37 100644 --- a/src/DiIiS-NA/BGS-Server/Base/ConnectHandler.cs +++ b/src/DiIiS-NA/BGS-Server/Base/ConnectHandler.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.Battle; using DotNetty.Codecs; using DotNetty.Codecs.Http; diff --git a/src/DiIiS-NA/BGS-Server/Base/HandlerController.cs b/src/DiIiS-NA/BGS-Server/Base/HandlerController.cs index 4f2486b..7fb43f8 100644 --- a/src/DiIiS-NA/BGS-Server/Base/HandlerController.cs +++ b/src/DiIiS-NA/BGS-Server/Base/HandlerController.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using DiIiS_NA.LoginServer.Battle; using Google.ProtocolBuffers; using System; diff --git a/src/DiIiS-NA/BGS-Server/Base/RPCCallback.cs b/src/DiIiS-NA/BGS-Server/Base/RPCCallback.cs index d6b291d..a6bcebf 100644 --- a/src/DiIiS-NA/BGS-Server/Base/RPCCallback.cs +++ b/src/DiIiS-NA/BGS-Server/Base/RPCCallback.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using Google.ProtocolBuffers; +using Google.ProtocolBuffers; using System; namespace DiIiS_NA.LoginServer.Base diff --git a/src/DiIiS-NA/BGS-Server/Battle/BattleBackend.cs b/src/DiIiS-NA/BGS-Server/Battle/BattleBackend.cs index 34e6a2e..349ff7a 100644 --- a/src/DiIiS-NA/BGS-Server/Battle/BattleBackend.cs +++ b/src/DiIiS-NA/BGS-Server/Battle/BattleBackend.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.Storage; using DiIiS_NA.Core.Storage.AccountDataBase.Entities; using DiIiS_NA.GameServer.AchievementSystem; diff --git a/src/DiIiS-NA/BGS-Server/Battle/PlayerManager.cs b/src/DiIiS-NA/BGS-Server/Battle/PlayerManager.cs index 26015e7..0e873fc 100644 --- a/src/DiIiS-NA/BGS-Server/Battle/PlayerManager.cs +++ b/src/DiIiS-NA/BGS-Server/Battle/PlayerManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/DiIiS-NA/BGS-Server/ChannelSystem/Channel.cs b/src/DiIiS-NA/BGS-Server/ChannelSystem/Channel.cs index 09e8494..795f3ad 100644 --- a/src/DiIiS-NA/BGS-Server/ChannelSystem/Channel.cs +++ b/src/DiIiS-NA/BGS-Server/ChannelSystem/Channel.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Collections.Concurrent; using System.Linq; diff --git a/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelInvitationManager.cs b/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelInvitationManager.cs index c6906a5..493bcd7 100644 --- a/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelInvitationManager.cs +++ b/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelInvitationManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using DiIiS_NA.LoginServer.AccountsSystem; using DiIiS_NA.LoginServer.Base; using DiIiS_NA.LoginServer.Battle; diff --git a/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelManager.cs b/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelManager.cs index 16d6978..399d2b5 100644 --- a/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelManager.cs +++ b/src/DiIiS-NA/BGS-Server/ChannelSystem/ChannelManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.Battle; using DiIiS_NA.LoginServer.GamesSystem; using DiIiS_NA.LoginServer.GuildSystem; diff --git a/src/DiIiS-NA/BGS-Server/ChannelSystem/Member.cs b/src/DiIiS-NA/BGS-Server/ChannelSystem/Member.cs index ab93fe3..60e42d7 100644 --- a/src/DiIiS-NA/BGS-Server/ChannelSystem/Member.cs +++ b/src/DiIiS-NA/BGS-Server/ChannelSystem/Member.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using bgs.protocol.channel.v1; using DiIiS_NA.LoginServer.AccountsSystem; diff --git a/src/DiIiS-NA/BGS-Server/Crypthography/ARC4.cs b/src/DiIiS-NA/BGS-Server/Crypthography/ARC4.cs index fe06bfe..5aca7ad 100644 --- a/src/DiIiS-NA/BGS-Server/Crypthography/ARC4.cs +++ b/src/DiIiS-NA/BGS-Server/Crypthography/ARC4.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -namespace DiIiS_NA.LoginServer.Crypthography +namespace DiIiS_NA.LoginServer.Crypthography { public class ARC4 { diff --git a/src/DiIiS-NA/BGS-Server/Crypthography/SRP6a.cs b/src/DiIiS-NA/BGS-Server/Crypthography/SRP6a.cs index d4eea21..21224f7 100644 --- a/src/DiIiS-NA/BGS-Server/Crypthography/SRP6a.cs +++ b/src/DiIiS-NA/BGS-Server/Crypthography/SRP6a.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Extensions; +using DiIiS_NA.Core.Extensions; using DiIiS_NA.LoginServer.AccountsSystem; using System; using System.Linq; diff --git a/src/DiIiS-NA/BGS-Server/FriendsSystem/FriendManager.cs b/src/DiIiS-NA/BGS-Server/FriendsSystem/FriendManager.cs index 561d52a..1f2ffc1 100644 --- a/src/DiIiS-NA/BGS-Server/FriendsSystem/FriendManager.cs +++ b/src/DiIiS-NA/BGS-Server/FriendsSystem/FriendManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Storage; +using DiIiS_NA.Core.Storage; using DiIiS_NA.Core.Storage.AccountDataBase.Entities; using DiIiS_NA.LoginServer.AccountsSystem; using DiIiS_NA.LoginServer.Base; diff --git a/src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs b/src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs index 19f5182..9971faa 100644 --- a/src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs +++ b/src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Storage; +using DiIiS_NA.Core.Storage; using DiIiS_NA.Core.Storage.AccountDataBase.Entities; using DiIiS_NA.LoginServer.AccountsSystem; using DiIiS_NA.LoginServer.Base; diff --git a/src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs b/src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs index 69dd836..1608d6d 100644 --- a/src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs +++ b/src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol.matchmaking.v1; +using bgs.protocol.matchmaking.v1; using DiIiS_NA.Core.Storage; using DiIiS_NA.LoginServer.Base; using DiIiS_NA.LoginServer.Battle; diff --git a/src/DiIiS-NA/BGS-Server/GamesSystem/GameFactoryManager.cs b/src/DiIiS-NA/BGS-Server/GamesSystem/GameFactoryManager.cs index 3046432..d9b616c 100644 --- a/src/DiIiS-NA/BGS-Server/GamesSystem/GameFactoryManager.cs +++ b/src/DiIiS-NA/BGS-Server/GamesSystem/GameFactoryManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol.matchmaking.v1; +using bgs.protocol.matchmaking.v1; using D3.OnlineService; using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.Battle; diff --git a/src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs b/src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs index b2fd924..747f7ba 100644 --- a/src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs +++ b/src/DiIiS-NA/BGS-Server/GuildSystem/Guild.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using DiIiS_NA.Core.Extensions; using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.Storage; diff --git a/src/DiIiS-NA/BGS-Server/GuildSystem/GuildManager.cs b/src/DiIiS-NA/BGS-Server/GuildSystem/GuildManager.cs index 2862d4e..0503401 100644 --- a/src/DiIiS-NA/BGS-Server/GuildSystem/GuildManager.cs +++ b/src/DiIiS-NA/BGS-Server/GuildSystem/GuildManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.Storage; using DiIiS_NA.Core.Storage.AccountDataBase.Entities; using DiIiS_NA.LoginServer.AccountsSystem; diff --git a/src/DiIiS-NA/BGS-Server/Helpers/EntityIdHelper.cs b/src/DiIiS-NA/BGS-Server/Helpers/EntityIdHelper.cs index 197077c..36f64fb 100644 --- a/src/DiIiS-NA/BGS-Server/Helpers/EntityIdHelper.cs +++ b/src/DiIiS-NA/BGS-Server/Helpers/EntityIdHelper.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -namespace DiIiS_NA.LoginServer.Helpers +namespace DiIiS_NA.LoginServer.Helpers { public static class EntityIdHelper { diff --git a/src/DiIiS-NA/BGS-Server/Helpers/FieldKeyHelper.cs b/src/DiIiS-NA/BGS-Server/Helpers/FieldKeyHelper.cs index 9b6f9ca..f415be1 100644 --- a/src/DiIiS-NA/BGS-Server/Helpers/FieldKeyHelper.cs +++ b/src/DiIiS-NA/BGS-Server/Helpers/FieldKeyHelper.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol.presence.v1; +using bgs.protocol.presence.v1; using DiIiS_NA.LoginServer.Objects; using System.Collections.Generic; diff --git a/src/DiIiS-NA/BGS-Server/Helpers/NotificationTypeHelper.cs b/src/DiIiS-NA/BGS-Server/Helpers/NotificationTypeHelper.cs index b2b3639..5d87c6a 100644 --- a/src/DiIiS-NA/BGS-Server/Helpers/NotificationTypeHelper.cs +++ b/src/DiIiS-NA/BGS-Server/Helpers/NotificationTypeHelper.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Text; diff --git a/src/DiIiS-NA/BGS-Server/Objects/PersistentRPCObject.cs b/src/DiIiS-NA/BGS-Server/Objects/PersistentRPCObject.cs index 7e30989..927f434 100644 --- a/src/DiIiS-NA/BGS-Server/Objects/PersistentRPCObject.cs +++ b/src/DiIiS-NA/BGS-Server/Objects/PersistentRPCObject.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Runtime.Serialization; +using System.Runtime.Serialization; namespace DiIiS_NA.LoginServer.Objects { diff --git a/src/DiIiS-NA/BGS-Server/Objects/PresenceField.cs b/src/DiIiS-NA/BGS-Server/Objects/PresenceField.cs index ed15938..d1cf673 100644 --- a/src/DiIiS-NA/BGS-Server/Objects/PresenceField.cs +++ b/src/DiIiS-NA/BGS-Server/Objects/PresenceField.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.LoginServer.Helpers; +using DiIiS_NA.LoginServer.Helpers; using Google.ProtocolBuffers; using System; using System.Collections.Generic; diff --git a/src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs b/src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs index 54cfa00..ae201b4 100644 --- a/src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs +++ b/src/DiIiS-NA/BGS-Server/Objects/RPCObject.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.Base; using DiIiS_NA.LoginServer.Battle; using System; diff --git a/src/DiIiS-NA/BGS-Server/Objects/RPCObjectManager.cs b/src/DiIiS-NA/BGS-Server/Objects/RPCObjectManager.cs index 2e0944a..ba8bbf4 100644 --- a/src/DiIiS-NA/BGS-Server/Objects/RPCObjectManager.cs +++ b/src/DiIiS-NA/BGS-Server/Objects/RPCObjectManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using DiIiS_NA.Core.Logging; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Service.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Service.cs index b595c1e..abe8b30 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Service.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Service.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Helpers.Hash; +using DiIiS_NA.Core.Helpers.Hash; using Google.ProtocolBuffers; using System; using System.Collections.Generic; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AccountService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AccountService.cs index d4f49d5..5f72a9e 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AccountService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AccountService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using Google.ProtocolBuffers; using bgs.protocol; using bgs.protocol.account.v1; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AuthenticationService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AuthenticationService.cs index 556c540..62a73ff 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AuthenticationService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/AuthenticationService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using bgs.protocol; using bgs.protocol.authentication.v1; using bgs.protocol.challenge.v1; @@ -117,12 +116,12 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services if (request.HasCachedWebCredentials) VerifyWebCredentials(controller, VerifyWebCredentialsRequest.CreateBuilder().SetWebCredentials(request.CachedWebCredentials).Build(), callback => { }); builder.SetPayloadType("web_auth_url"); - if (REST.Config.Instance.Public) + if (REST.RestConfig.Instance.Public) builder.SetPayload(ByteString.CopyFromUtf8( - $"http://{REST.Config.Instance.PublicIP}:{REST.Config.Instance.Port}/battlenet/login")); + $"http://{REST.RestConfig.Instance.PublicIP}:{REST.RestConfig.Instance.Port}/battlenet/login")); else builder.SetPayload(ByteString.CopyFromUtf8( - $"http://{Program.RestServerIp}:{REST.Config.Instance.Port}/battlenet/login")); + $"http://{Program.RestServerIp}:{REST.RestConfig.Instance.Port}/battlenet/login")); ((HandlerController)controller).Client.MakeRpc((lid) => ChallengeListener.CreateStub(((HandlerController)controller).Client).OnExternalChallenge(controller, builder.Build(), callback => { })); #endregion diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChallengeService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChallengeService.cs index a435761..321525f 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChallengeService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChallengeService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.challenge.v1; using Google.ProtocolBuffers; using System; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelInvitationService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelInvitationService.cs index 6c70cfb..9f3d027 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelInvitationService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelInvitationService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.channel.v1; using DiIiS_NA.Core.Extensions; using DiIiS_NA.Core.Logging; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelMembershipService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelMembershipService.cs index 6a5046f..06e3098 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelMembershipService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelMembershipService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.channel.v2.membership; using Google.ProtocolBuffers; using System; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelOwnerService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelOwnerService.cs index bf4b971..4353c95 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelOwnerService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelOwnerService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol.channel.v1; +using bgs.protocol.channel.v1; using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.Base; using DiIiS_NA.LoginServer.ChannelSystem; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs index 4793b10..c947ba7 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Extensions; +using DiIiS_NA.Core.Extensions; using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.Storage; using DiIiS_NA.Core.Storage.AccountDataBase.Entities; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ConnectionSerivce.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ConnectionSerivce.cs index 51937a6..c2f3904 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ConnectionSerivce.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ConnectionSerivce.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.LoginServer.Base; +using DiIiS_NA.LoginServer.Base; using System; using bgs.protocol; using bgs.protocol.authentication.v1; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameMasterService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameMasterService.cs index caea458..aa5dac0 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameMasterService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameMasterService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.games.v1; using Google.ProtocolBuffers; using System; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameRequestService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameRequestService.cs index 9b0854f..a0ffd54 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameRequestService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameRequestService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.matchmaking.v1; using D3.OnlineService; using DiIiS_NA.LoginServer.AccountsSystem; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs index f179b1a..e99442a 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs @@ -1,6 +1,4 @@ -//Blizzless Project 2022 - -using bgs.protocol; +using bgs.protocol; using bgs.protocol.game_utilities.v1; using bgs.protocol.notification.v1; using D3.GameMessage; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/NotificationService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/NotificationService.cs index a3329d3..c736810 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/NotificationService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/NotificationService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using bgs.protocol; using bgs.protocol.notification.v1; using DiIiS_NA.Core.Logging; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs index 0393d84..30793e0 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Reflection; using Google.ProtocolBuffers; using bgs.protocol; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs index 90d3560..2fde2aa 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Reflection; using bgs.protocol; using bgs.protocol.resources.v1; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs index d536da8..ba1646f 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Reflection; using bgs.protocol; using bgs.protocol.session.v1; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SocialNetworkService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SocialNetworkService.cs index 9430a99..92d5492 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SocialNetworkService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SocialNetworkService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.sns.v1; using Google.ProtocolBuffers; using System; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs index 0f9e0de..d8edbce 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.user_manager.v1; using DiIiS_NA.Core.Logging; using DiIiS_NA.LoginServer.AccountsSystem; diff --git a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/WhisperService.cs b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/WhisperService.cs index 4162765..c8fd629 100644 --- a/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/WhisperService.cs +++ b/src/DiIiS-NA/BGS-Server/ServicesSystem/Services/WhisperService.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using bgs.protocol; +using bgs.protocol; using bgs.protocol.whisper.v1; using DiIiS_NA.LoginServer.ServicesSystem; using Google.ProtocolBuffers; diff --git a/src/DiIiS-NA/BGS-Server/Watchdog.cs b/src/DiIiS-NA/BGS-Server/Watchdog.cs index 759e3d9..96d2659 100644 --- a/src/DiIiS-NA/BGS-Server/Watchdog.cs +++ b/src/DiIiS-NA/BGS-Server/Watchdog.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.Schedulers; using System; using System.Collections.Generic; diff --git a/src/DiIiS-NA/Core/Config/Config.cs b/src/DiIiS-NA/Core/Config/Config.cs index 27629b0..5fcd599 100644 --- a/src/DiIiS-NA/Core/Config/Config.cs +++ b/src/DiIiS-NA/Core/Config/Config.cs @@ -1,6 +1,4 @@ -//Blizzless Project 2022 - -using System; +using System; using DiIiS_NA.Core.Logging; using Nini.Config; diff --git a/src/DiIiS-NA/Core/Config/ConfigManager.cs b/src/DiIiS-NA/Core/Config/ConfigManager.cs index 69a449a..439783d 100644 --- a/src/DiIiS-NA/Core/Config/ConfigManager.cs +++ b/src/DiIiS-NA/Core/Config/ConfigManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using DiIiS_NA.Core.Helpers.IO; using DiIiS_NA.Core.Logging; using Nini.Config; diff --git a/src/DiIiS-NA/Core/Extensions/ArrayExtensions.cs b/src/DiIiS-NA/Core/Extensions/ArrayExtensions.cs index ff346d3..df49487 100644 --- a/src/DiIiS-NA/Core/Extensions/ArrayExtensions.cs +++ b/src/DiIiS-NA/Core/Extensions/ArrayExtensions.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/src/DiIiS-NA/Core/Extensions/CodedOutputStream.cs b/src/DiIiS-NA/Core/Extensions/CodedOutputStream.cs index 3d78750..5ce94e0 100644 --- a/src/DiIiS-NA/Core/Extensions/CodedOutputStream.cs +++ b/src/DiIiS-NA/Core/Extensions/CodedOutputStream.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; namespace DiIiS_NA.Core.Extensions { diff --git a/src/DiIiS-NA/Core/Extensions/DateTimeExtensions.cs b/src/DiIiS-NA/Core/Extensions/DateTimeExtensions.cs index d77794b..3567561 100644 --- a/src/DiIiS-NA/Core/Extensions/DateTimeExtensions.cs +++ b/src/DiIiS-NA/Core/Extensions/DateTimeExtensions.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; namespace DiIiS_NA.Core.Extensions diff --git a/src/DiIiS-NA/Core/Extensions/IMessageExtensions.cs b/src/DiIiS-NA/Core/Extensions/IMessageExtensions.cs index 1630ca0..0ce4b09 100644 --- a/src/DiIiS-NA/Core/Extensions/IMessageExtensions.cs +++ b/src/DiIiS-NA/Core/Extensions/IMessageExtensions.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Text; using Google.ProtocolBuffers; using Google.ProtocolBuffers.Descriptors; diff --git a/src/DiIiS-NA/Core/Extensions/ListExtensions.cs b/src/DiIiS-NA/Core/Extensions/ListExtensions.cs index ffc261d..2eed864 100644 --- a/src/DiIiS-NA/Core/Extensions/ListExtensions.cs +++ b/src/DiIiS-NA/Core/Extensions/ListExtensions.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; namespace DiIiS_NA.Core.Extensions { diff --git a/src/DiIiS-NA/Core/Extensions/StringExtensions.cs b/src/DiIiS-NA/Core/Extensions/StringExtensions.cs index b4e980d..0d9495f 100644 --- a/src/DiIiS-NA/Core/Extensions/StringExtensions.cs +++ b/src/DiIiS-NA/Core/Extensions/StringExtensions.cs @@ -1,6 +1,4 @@ -//Blizzless Project 2022 - -using System; +using System; using System.Collections.Generic; using System.Text; diff --git a/src/DiIiS-NA/Core/Extensions/Utilities.cs b/src/DiIiS-NA/Core/Extensions/Utilities.cs index b196288..e7a9201 100644 --- a/src/DiIiS-NA/Core/Extensions/Utilities.cs +++ b/src/DiIiS-NA/Core/Extensions/Utilities.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/DiIiS-NA/Core/Helpers/Hash/StringHashHelper.cs b/src/DiIiS-NA/Core/Helpers/Hash/StringHashHelper.cs index 3465239..c85e734 100644 --- a/src/DiIiS-NA/Core/Helpers/Hash/StringHashHelper.cs +++ b/src/DiIiS-NA/Core/Helpers/Hash/StringHashHelper.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Linq; +using System.Linq; using System.Text; namespace DiIiS_NA.Core.Helpers.Hash diff --git a/src/DiIiS-NA/Core/Helpers/IO/FileHelpers.cs b/src/DiIiS-NA/Core/Helpers/IO/FileHelpers.cs index 06d92b0..fbe6353 100644 --- a/src/DiIiS-NA/Core/Helpers/IO/FileHelpers.cs +++ b/src/DiIiS-NA/Core/Helpers/IO/FileHelpers.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; diff --git a/src/DiIiS-NA/Core/Helpers/Math/FastRandom.cs b/src/DiIiS-NA/Core/Helpers/Math/FastRandom.cs index c170723..1d99752 100644 --- a/src/DiIiS-NA/Core/Helpers/Math/FastRandom.cs +++ b/src/DiIiS-NA/Core/Helpers/Math/FastRandom.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Text; using DiIiS_NA.Core.Logging; diff --git a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs index cca05f5..88cee59 100644 --- a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs +++ b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs @@ -233,4 +233,12 @@ public class AnsiTarget : LogTarget _ => new Style(Color.White) }; } +} + +public static class AnsiTargetExtensions +{ + public static string SafeAnsi(this string text) + { + return text.Replace("$[", "").Replace("]$", "").Replace("[", "[[").Replace("]", "]]"); + } } \ No newline at end of file diff --git a/src/DiIiS-NA/Core/Logging/FileTarget.cs b/src/DiIiS-NA/Core/Logging/FileTarget.cs index 705f5c9..dc9d9d7 100644 --- a/src/DiIiS-NA/Core/Logging/FileTarget.cs +++ b/src/DiIiS-NA/Core/Logging/FileTarget.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Concurrent; using System.IO; using System.Text.RegularExpressions; diff --git a/src/DiIiS-NA/Core/Logging/LogConfig.cs b/src/DiIiS-NA/Core/Logging/LogConfig.cs index c74884c..c9bb9a3 100644 --- a/src/DiIiS-NA/Core/Logging/LogConfig.cs +++ b/src/DiIiS-NA/Core/Logging/LogConfig.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -namespace DiIiS_NA.Core.Logging +namespace DiIiS_NA.Core.Logging { public sealed class LogConfig : Config.Config { diff --git a/src/DiIiS-NA/Core/Logging/LogManager.cs b/src/DiIiS-NA/Core/Logging/LogManager.cs index de81752..dc3e7eb 100644 --- a/src/DiIiS-NA/Core/Logging/LogManager.cs +++ b/src/DiIiS-NA/Core/Logging/LogManager.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/src/DiIiS-NA/Core/Logging/LogRouter.cs b/src/DiIiS-NA/Core/Logging/LogRouter.cs index 9a1ed4c..22903d5 100644 --- a/src/DiIiS-NA/Core/Logging/LogRouter.cs +++ b/src/DiIiS-NA/Core/Logging/LogRouter.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Linq; namespace DiIiS_NA.Core.Logging diff --git a/src/DiIiS-NA/Core/Logging/LogTarget.cs b/src/DiIiS-NA/Core/Logging/LogTarget.cs index 4bdd3d9..105503b 100644 --- a/src/DiIiS-NA/Core/Logging/LogTarget.cs +++ b/src/DiIiS-NA/Core/Logging/LogTarget.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; namespace DiIiS_NA.Core.Logging { diff --git a/src/DiIiS-NA/Core/Logging/Logger.cs b/src/DiIiS-NA/Core/Logging/Logger.cs index 242ea79..52b893b 100644 --- a/src/DiIiS-NA/Core/Logging/Logger.cs +++ b/src/DiIiS-NA/Core/Logging/Logger.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Globalization; using System.IO; using System.Linq; diff --git a/src/DiIiS-NA/Core/MPQ/Asset.cs b/src/DiIiS-NA/Core/MPQ/Asset.cs index fbcd6d8..9fbe488 100644 --- a/src/DiIiS-NA/Core/MPQ/Asset.cs +++ b/src/DiIiS-NA/Core/MPQ/Asset.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 - using DiIiS_NA.Core.Logging; + using DiIiS_NA.Core.Logging; using DiIiS_NA.GameServer.Core.Types.SNO; using System; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Accolade.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Accolade.cs index 8a9bbf5..363e07a 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Accolade.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Accolade.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Act.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Act.cs index a7ad0bf..09d4a09 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Act.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Act.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.Math; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/ActorData.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/ActorData.cs index e323364..095a539 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/ActorData.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/ActorData.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.GameServer.Core.Types.Math; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.Core.Types.Collision; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Adventure.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Adventure.cs index 62e32b6..2e20366 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Adventure.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Adventure.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/AmbientSound.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/AmbientSound.cs index 5f7f184..d3cee54 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/AmbientSound.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/AmbientSound.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Anim.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Anim.cs index a287364..d4963e6 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Anim.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Anim.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.Math; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/AnimSet.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/AnimSet.cs index 2b229f5..2522eef 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/AnimSet.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/AnimSet.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; using System.Collections.Generic; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Animation2D.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Animation2D.cs index 53beffd..2070cca 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Animation2D.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Animation2D.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/BossEncounter.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/BossEncounter.cs index 41506ff..6ae53a0 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/BossEncounter.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/BossEncounter.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Condition.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Condition.cs index abe2144..9eb2c9d 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Condition.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Condition.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Conversation.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Conversation.cs index 59fc4b1..2828c58 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Conversation.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Conversation.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using CrystalMpq; using Gibbed.IO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/ConversationList.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/ConversationList.cs index 7d71f7b..cc6e50d 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/ConversationList.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/ConversationList.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/EffectGroup.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/EffectGroup.cs index a672e19..6cc0165 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/EffectGroup.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/EffectGroup.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Encounter.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Encounter.cs index 735a981..6533b44 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Encounter.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Encounter.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/GameBalance.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/GameBalance.cs index fb107f7..c91545f 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/GameBalance.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/GameBalance.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.Helpers.Hash; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Globals.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Globals.cs index d327ced..b2bca70 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Globals.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Globals.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/LevelArea.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/LevelArea.cs index fff0464..e59baf2 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/LevelArea.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/LevelArea.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Lore.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Lore.cs index e71445b..26e701e 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Lore.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Lore.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.Core.MPQ.FileFormats.Types; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/MarkerSet.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/MarkerSet.cs index acb8996..60d8b75 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/MarkerSet.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/MarkerSet.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.Core.Types.Collision; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Observer.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Observer.cs index 124160f..6249e47 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Observer.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Observer.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.Core.Types.Math; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/PhysMesh.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/PhysMesh.cs index 5cca11b..27b9814 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/PhysMesh.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/PhysMesh.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.Core.MPQ.FileFormats.Types; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Power.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Power.cs index 2e2367b..53de5a3 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Power.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Power.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.Core.MPQ.FileFormats.Types; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Quest.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Quest.cs index 16ad9d6..a33c98c 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Quest.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Quest.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/QuestRange.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/QuestRange.cs index 63ee85f..66a3e4d 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/QuestRange.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/QuestRange.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Recipe.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Recipe.cs index f0f5a84..3327814 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Recipe.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Recipe.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Rope.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Rope.cs index 560a993..39ca4d0 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Rope.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Rope.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.Core.Types.Math; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Scene.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Scene.cs index 712352e..d77acbd 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Scene.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Scene.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/SceneGroup.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/SceneGroup.cs index 9755fbe..bcb540c 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/SceneGroup.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/SceneGroup.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using Gibbed.IO; using DiIiS_NA.GameServer.Core.Types.SNO; using DiIiS_NA.Core.MPQ.FileFormats.Types; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/SkillKit.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/SkillKit.cs index 13c2ceb..37c4aa4 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/SkillKit.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/SkillKit.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/TreasureClass.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/TreasureClass.cs index c40ff5f..14952a8 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/TreasureClass.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/TreasureClass.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.Core.Storage; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Tutorial.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Tutorial.cs index de81edd..7e9cde2 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Tutorial.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Tutorial.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Types/Common.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Types/Common.cs index 3c3cb42..935622c 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Types/Common.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Types/Common.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.Storage; using DiIiS_NA.GameServer.Core.Types.Misc; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/Weather.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/Weather.cs index 4c23abe..4441557 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/Weather.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/Weather.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using CrystalMpq; +using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Core/MPQ/FileFormats/World.cs b/src/DiIiS-NA/Core/MPQ/FileFormats/World.cs index 9d88943..b5787d9 100644 --- a/src/DiIiS-NA/Core/MPQ/FileFormats/World.cs +++ b/src/DiIiS-NA/Core/MPQ/FileFormats/World.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System.Collections.Generic; +using System.Collections.Generic; using CrystalMpq; using DiIiS_NA.Core.MPQ.FileFormats.Types; using DiIiS_NA.Core.Storage; diff --git a/src/DiIiS-NA/D3-GameServer/ClientSystem/ClientManager.cs b/src/DiIiS-NA/D3-GameServer/ClientSystem/ClientManager.cs index 270fd78..998189b 100644 --- a/src/DiIiS-NA/D3-GameServer/ClientSystem/ClientManager.cs +++ b/src/DiIiS-NA/D3-GameServer/ClientSystem/ClientManager.cs @@ -1,28 +1,15 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Extensions; -//Blizzless Project 2022 +using DiIiS_NA.Core.Extensions; using DiIiS_NA.Core.Logging; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.GameSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PlayerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Act; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Connection; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Game; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Misc; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Portal; -//Blizzless Project 2022 using DiIiS_NA.LoginServer.Toons; -//Blizzless Project 2022 using System; -//Blizzless Project 2022 using System.Linq; namespace DiIiS_NA.GameServer.ClientSystem diff --git a/src/DiIiS-NA/D3-GameServer/CommandManager/CommandManager.cs b/src/DiIiS-NA/D3-GameServer/CommandManager/CommandManager.cs index bebfa65..55e7023 100644 --- a/src/DiIiS-NA/D3-GameServer/CommandManager/CommandManager.cs +++ b/src/DiIiS-NA/D3-GameServer/CommandManager/CommandManager.cs @@ -11,8 +11,8 @@ namespace DiIiS_NA.GameServer.CommandManager { public static class CommandManager { - private static readonly Logger Logger = LogManager.CreateLogger("CmdMan"); - private static readonly Dictionary CommandGroups = new Dictionary(); + private static readonly Logger Logger = LogManager.CreateLogger(nameof(CommandManager)); + private static readonly Dictionary CommandGroups = new(); static CommandManager() { @@ -66,7 +66,7 @@ namespace DiIiS_NA.GameServer.CommandManager if (found == false) { - Logger.Error("Unknown command: " + command); + Logger.Error("Unknown command: " + command.SafeAnsi()); return; } @@ -83,19 +83,16 @@ namespace DiIiS_NA.GameServer.CommandManager public static bool TryParse(string line, BattleClient invokerClient) { string output = string.Empty; - string command; - string parameters; var found = false; if (invokerClient == null) - throw new ArgumentException("invokerClient"); + throw new ArgumentException(nameof(invokerClient)); - if (!ExtractCommandAndParameters(line, out command, out parameters)) + if (!ExtractCommandAndParameters(line, out var command, out var parameters)) return false; - foreach (var pair in CommandGroups) + foreach (var pair in CommandGroups.Where(pair => pair.Key.Name == command)) { - if (pair.Key.Name != command) continue; output = pair.Value.Handle(parameters, invokerClient); found = true; break; @@ -181,7 +178,7 @@ namespace DiIiS_NA.GameServer.CommandManager } if (!found) - output = $"Unknown command: {group} {command}"; + output = $"Unknown command: {group.SafeAnsi()} {command.SafeAnsi()}"; return output; } diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/Banner.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/Banner.cs index 13b9d50..a4dd99d 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/Banner.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/Implementations/Banner.cs @@ -1,15 +1,9 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; -//Blizzless Project 2022 using System.Linq; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.MapSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.TagMap; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PlayerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.World; using DiIiS_NA.D3_GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.MessageSystem; diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/ConversationManager.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/ConversationManager.cs index 68d9d9b..373671a 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/ConversationManager.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/ConversationManager.cs @@ -1,61 +1,32 @@ -//Blizzless Project 2022 -using System; -//Blizzless Project 2022 +using System; using System.Collections.Generic; -//Blizzless Project 2022 using System.Linq; -//Blizzless Project 2022 using System.Threading.Tasks; -//Blizzless Project 2022 using DiIiS_NA.Core.Logging; -//Blizzless Project 2022 using DiIiS_NA.Core.Helpers.Math; -//Blizzless Project 2022 using DiIiS_NA.Core.Storage.AccountDataBase.Entities; -//Blizzless Project 2022 using DiIiS_NA.Core.MPQ; -//Blizzless Project 2022 using DiIiS_NA.Core.MPQ.FileFormats; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.SNO; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ItemsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Inventory; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.ACD; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Artisan; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Misc; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ObjectsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Fields; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Effect; -//Blizzless Project 2022 using DiIiS_NA.GameServer.ClientSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Base; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PowerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.Math; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Conversation; -//Blizzless Project 2022 using System.Collections.Concurrent; using DiIiS_NA.Core.Extensions; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Quest; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Platinum; using DiIiS_NA.D3_GameServer.Core.Types.SNO; using DiIiS_NA.GameServer.Core.Types.TagMap; diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs index 2b45c4e..2d2486a 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs @@ -1,124 +1,64 @@ -//Blizzless Project 2022 - -using System; -//Blizzless Project 2022 +using System; using System.Collections.Generic; using System.Collections.Immutable; -//Blizzless Project 2022 using System.Linq; -//Blizzless Project 2022 using DiIiS_NA.Core.Logging; -//Blizzless Project 2022 using DiIiS_NA.LoginServer.Toons; -//Blizzless Project 2022 using DiIiS_NA.GameServer.ClientSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ObjectsSystem; -//Blizzless Project 2022 using GameBalance = DiIiS_NA.Core.MPQ.FileFormats.GameBalance; -//Blizzless Project 2022 using DiIiS_NA.Core.Storage; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.MapSystem; -//Blizzless Project 2022 using System.Threading; -//Blizzless Project 2022 using DiIiS_NA.Core.Storage.AccountDataBase.Entities; -//Blizzless Project 2022 using DiIiS_NA.Core.Extensions; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.Math; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Fields; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.ACD; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Text; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Player; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Skill; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Misc; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.World; -//Blizzless Project 2022 using DiIiS_NA.Core.MPQ; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.SNO; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Quest; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Base; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Effect; -//Blizzless Project 2022 using DiIiS_NA.LoginServer.AccountsSystem; -//Blizzless Project 2022 using System.Drawing; using System.Reflection; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.TickerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.SkillsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.TagMap; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PowerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.AISystem.Brains; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PowerSystem.Implementations; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ItemsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.Hirelings; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Fields.BlizzLess.Net.GS.Message.Fields; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.GameSystem; -//Blizzless Project 2022 using Google.ProtocolBuffers; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Animation; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Waypoint; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Trade; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Inventory; -//Blizzless Project 2022 using DiIiS_NA.Core.Helpers.Math; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Connection; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Artisan; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Portal; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Camera; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.Minions; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Pet; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Game; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Combat; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Hireling; -//Blizzless Project 2022 using DiIiS_NA.Core.Helpers.Hash; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Encounter; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.UI; using DiIiS_NA.D3_GameServer.Core.Types.SNO; using DiIiS_NA.D3_GameServer.GSSystem.ActorSystem.Implementations.Artisans; @@ -3673,7 +3613,7 @@ public class Player : Actor, IMessageConsumer, IUpdateable System.Threading.Tasks.Task.Delay(3).Wait(); RevealActorsToPlayer(); - if (!_motdSent && LoginServer.Config.Instance.MotdEnabled) + if (!_motdSent && LoginServer.LoginServerConfig.Instance.MotdEnabled) InGameClient.BnetClient.SendMotd(); // } diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Implementations/HeroSkills/Barbarian.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Implementations/HeroSkills/Barbarian.cs index 150fdfb..3c973d9 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Implementations/HeroSkills/Barbarian.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Implementations/HeroSkills/Barbarian.cs @@ -1,4 +1,3 @@ -//Blizzless Project 2022 using DiIiS_NA.D3_GameServer.Core.Types.SNO; using DiIiS_NA.D3_GameServer.GSSystem.ActorSystem.Implementations.Minions; using DiIiS_NA.GameServer.Core.Types.Math; @@ -14,7 +13,6 @@ using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.ACD; using System; using System.Collections.Generic; using System.Linq; -//Blizzless Project 2022 using System.Threading.Tasks; using DiIiS_NA.Core.Extensions; diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/DeathPayload.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/DeathPayload.cs index 49ed878..a37fb56 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/DeathPayload.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/PowerSystem/Payloads/DeathPayload.cs @@ -1,58 +1,30 @@ -//Blizzless Project 2022 using System; -//Blizzless Project 2022 using System.Collections.Generic; -//Blizzless Project 2022 using System.Linq; -//Blizzless Project 2022 using System.Threading.Tasks; -//Blizzless Project 2022 using DiIiS_NA.Core.Logging; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.Hirelings; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Misc; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Animation; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PlayerSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.PowerSystem.Implementations; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Effect; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Combat; -//Blizzless Project 2022 using DiIiS_NA.Core.Helpers.Math; -//Blizzless Project 2022 using DiIiS_NA.LoginServer.Toons; -//Blizzless Project 2022 using DiIiS_NA.GameServer.Core.Types.TagMap; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.GeneratorsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ItemsSystem; -//Blizzless Project 2022 using DiIiS_NA.GameServer.GSSystem.ActorSystem.Implementations.Minions; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Player; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.ACD; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Base; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Text; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Quest; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.World; -//Blizzless Project 2022 using DiIiS_NA.GameServer.MessageSystem.Message.Fields; using DiIiS_NA.D3_GameServer.Core.Types.SNO; diff --git a/src/DiIiS-NA/Program.cs b/src/DiIiS-NA/Program.cs index 2f1b042..7f58ea9 100644 --- a/src/DiIiS-NA/Program.cs +++ b/src/DiIiS-NA/Program.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Discord.Modules; +using DiIiS_NA.Core.Discord.Modules; using DiIiS_NA.Core.Logging; using DiIiS_NA.Core.MPQ; using DiIiS_NA.Core.Storage; @@ -61,9 +60,9 @@ namespace DiIiS_NA public static Thread GameServerThread; public static Thread WatchdogThread; - public static string LoginServerIp = DiIiS_NA.LoginServer.Config.Instance.BindIP; + public static string LoginServerIp = DiIiS_NA.LoginServer.LoginServerConfig.Instance.BindIP; public static string GameServerIp = DiIiS_NA.GameServer.GameServerConfig.Instance.BindIP; - public static string RestServerIp = REST.Config.Instance.IP; + public static string RestServerIp = REST.RestConfig.Instance.IP; public static string PublicGameServerIp = DiIiS_NA.GameServer.NATConfig.Instance.PublicIP; public static int Build => 30; @@ -198,14 +197,14 @@ namespace DiIiS_NA } var restSocketServer = new SocketManager(); - if (!restSocketServer.StartNetwork(RestServerIp, REST.Config.Instance.Port)) + if (!restSocketServer.StartNetwork(RestServerIp, REST.RestConfig.Instance.Port)) { throw new Exception("Diablo III Core - Disabled"); } - Logger.Success($"$[underline darkgreen]$REST$[/]$ server started - {REST.Config.Instance.IP}:{REST.Config.Instance.Port}"); + Logger.Success($"$[underline darkgreen]$REST$[/]$ server started - {REST.RestConfig.Instance.IP}:{REST.RestConfig.Instance.Port}"); //BGS - var loginConfig = DiIiS_NA.LoginServer.Config.Instance; + var loginConfig = DiIiS_NA.LoginServer.LoginServerConfig.Instance; ServerBootstrap serverBootstrap = new ServerBootstrap(); IEventLoopGroup boss = new MultithreadEventLoopGroup(1), worker = new MultithreadEventLoopGroup(); @@ -393,7 +392,7 @@ namespace DiIiS_NA Logger.Info("Discord bot Disabled.."); } DiIiS_NA.GameServer.GSSystem.GeneratorsSystem.SpawnGenerator.RegenerateDensity(); - DiIiS_NA.GameServer.ClientSystem.GameServer.GSBackend = new GsBackend(DiIiS_NA.LoginServer.Config.Instance.BindIP, DiIiS_NA.LoginServer.Config.Instance.WebPort); + DiIiS_NA.GameServer.ClientSystem.GameServer.GSBackend = new GsBackend(DiIiS_NA.LoginServer.LoginServerConfig.Instance.BindIP, DiIiS_NA.LoginServer.LoginServerConfig.Instance.WebPort); } static bool SetTitle(string text) diff --git a/src/DiIiS-NA/REST/RestSession.cs b/src/DiIiS-NA/REST/RestSession.cs index f5886bb..73e5e64 100644 --- a/src/DiIiS-NA/REST/RestSession.cs +++ b/src/DiIiS-NA/REST/RestSession.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/DiIiS-NA/REST/SocketBase.cs b/src/DiIiS-NA/REST/SocketBase.cs index 9d6dcc1..148381a 100644 --- a/src/DiIiS-NA/REST/SocketBase.cs +++ b/src/DiIiS-NA/REST/SocketBase.cs @@ -1,5 +1,4 @@ -//Blizzless Project 2022 -using DiIiS_NA.Core.Logging; +using DiIiS_NA.Core.Logging; using System; using System.Net; using System.Net.Sockets;