Merge branch 'refs/heads/master' into feat/postgresql-database
# Conflicts: # config.yaml # docker-compose.yml # pom.xml # src/main/java/client/Character.java # src/main/java/client/Client.java # src/main/java/client/MonsterBook.java # src/main/java/client/command/commands/gm0/BuyBackCommand.java # src/main/java/client/processor/stat/AssignAPProcessor.java # src/main/java/config/ServerConfig.java # src/main/java/net/server/channel/Channel.java # src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java # src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java # src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java # src/main/java/net/server/channel/handlers/EnterMTSHandler.java # src/main/java/net/server/channel/handlers/NPCTalkHandler.java # src/main/java/net/server/channel/handlers/RangedAttackHandler.java # src/main/java/net/server/channel/handlers/SummonDamageHandler.java # src/main/java/net/server/channel/handlers/UseCashItemHandler.java # src/main/java/net/server/handlers/login/CreateCharHandler.java # src/main/java/net/server/world/World.java # src/main/java/scripting/npc/NPCConversationManager.java # src/main/java/server/ItemInformationProvider.java # src/main/java/server/life/Monster.java # src/main/java/server/life/MonsterInformationProvider.java # src/main/java/server/maps/MapleMap.java # src/main/java/tools/PacketCreator.java # src/test/java/service/NoteServiceTest.java # src/test/java/testutil/Any.java
This commit is contained in:
@@ -23,11 +23,174 @@ package net;
|
||||
|
||||
import net.netty.LoginServer;
|
||||
import net.opcodes.RecvOpcode;
|
||||
import net.server.channel.handlers.*;
|
||||
import net.server.channel.handlers.AcceptFamilyHandler;
|
||||
import net.server.channel.handlers.AdminChatHandler;
|
||||
import net.server.channel.handlers.AdminCommandHandler;
|
||||
import net.server.channel.handlers.AdminLogHandler;
|
||||
import net.server.channel.handlers.AllianceOperationHandler;
|
||||
import net.server.channel.handlers.AranComboHandler;
|
||||
import net.server.channel.handlers.AutoAggroHandler;
|
||||
import net.server.channel.handlers.AutoAssignHandler;
|
||||
import net.server.channel.handlers.BBSOperationHandler;
|
||||
import net.server.channel.handlers.BeholderHandler;
|
||||
import net.server.channel.handlers.BuddylistModifyHandler;
|
||||
import net.server.channel.handlers.CancelBuffHandler;
|
||||
import net.server.channel.handlers.CancelChairHandler;
|
||||
import net.server.channel.handlers.CancelDebuffHandler;
|
||||
import net.server.channel.handlers.CancelItemEffectHandler;
|
||||
import net.server.channel.handlers.CashOperationHandler;
|
||||
import net.server.channel.handlers.CashShopSurpriseHandler;
|
||||
import net.server.channel.handlers.ChangeChannelHandler;
|
||||
import net.server.channel.handlers.ChangeMapHandler;
|
||||
import net.server.channel.handlers.ChangeMapSpecialHandler;
|
||||
import net.server.channel.handlers.CharInfoRequestHandler;
|
||||
import net.server.channel.handlers.ClickGuideHandler;
|
||||
import net.server.channel.handlers.CloseChalkboardHandler;
|
||||
import net.server.channel.handlers.CloseRangeDamageHandler;
|
||||
import net.server.channel.handlers.CoconutHandler;
|
||||
import net.server.channel.handlers.CouponCodeHandler;
|
||||
import net.server.channel.handlers.DamageSummonHandler;
|
||||
import net.server.channel.handlers.DenyAllianceRequestHandler;
|
||||
import net.server.channel.handlers.DenyGuildRequestHandler;
|
||||
import net.server.channel.handlers.DenyPartyRequestHandler;
|
||||
import net.server.channel.handlers.DistributeAPHandler;
|
||||
import net.server.channel.handlers.DistributeSPHandler;
|
||||
import net.server.channel.handlers.DoorHandler;
|
||||
import net.server.channel.handlers.DueyHandler;
|
||||
import net.server.channel.handlers.EnterCashShopHandler;
|
||||
import net.server.channel.handlers.EnterMTSHandler;
|
||||
import net.server.channel.handlers.FaceExpressionHandler;
|
||||
import net.server.channel.handlers.FamilyAddHandler;
|
||||
import net.server.channel.handlers.FamilyPreceptsHandler;
|
||||
import net.server.channel.handlers.FamilySeparateHandler;
|
||||
import net.server.channel.handlers.FamilySummonResponseHandler;
|
||||
import net.server.channel.handlers.FamilyUseHandler;
|
||||
import net.server.channel.handlers.FieldDamageMobHandler;
|
||||
import net.server.channel.handlers.FredrickHandler;
|
||||
import net.server.channel.handlers.GeneralChatHandler;
|
||||
import net.server.channel.handlers.GiveFameHandler;
|
||||
import net.server.channel.handlers.GrenadeEffectHandler;
|
||||
import net.server.channel.handlers.GuildOperationHandler;
|
||||
import net.server.channel.handlers.HealOvertimeHandler;
|
||||
import net.server.channel.handlers.HiredMerchantRequest;
|
||||
import net.server.channel.handlers.InnerPortalHandler;
|
||||
import net.server.channel.handlers.InventoryMergeHandler;
|
||||
import net.server.channel.handlers.InventorySortHandler;
|
||||
import net.server.channel.handlers.ItemMoveHandler;
|
||||
import net.server.channel.handlers.ItemPickupHandler;
|
||||
import net.server.channel.handlers.ItemRewardHandler;
|
||||
import net.server.channel.handlers.KeymapChangeHandler;
|
||||
import net.server.channel.handlers.LeftKnockbackHandler;
|
||||
import net.server.channel.handlers.MTSHandler;
|
||||
import net.server.channel.handlers.MagicDamageHandler;
|
||||
import net.server.channel.handlers.MakerSkillHandler;
|
||||
import net.server.channel.handlers.MesoDropHandler;
|
||||
import net.server.channel.handlers.MessengerHandler;
|
||||
import net.server.channel.handlers.MobBanishPlayerHandler;
|
||||
import net.server.channel.handlers.MobDamageMobFriendlyHandler;
|
||||
import net.server.channel.handlers.MobDamageMobHandler;
|
||||
import net.server.channel.handlers.MonsterBombHandler;
|
||||
import net.server.channel.handlers.MonsterBookCoverHandler;
|
||||
import net.server.channel.handlers.MonsterCarnivalHandler;
|
||||
import net.server.channel.handlers.MoveDragonHandler;
|
||||
import net.server.channel.handlers.MoveLifeHandler;
|
||||
import net.server.channel.handlers.MovePetHandler;
|
||||
import net.server.channel.handlers.MovePlayerHandler;
|
||||
import net.server.channel.handlers.MoveSummonHandler;
|
||||
import net.server.channel.handlers.MultiChatHandler;
|
||||
import net.server.channel.handlers.NPCAnimationHandler;
|
||||
import net.server.channel.handlers.NPCMoreTalkHandler;
|
||||
import net.server.channel.handlers.NPCShopHandler;
|
||||
import net.server.channel.handlers.NPCTalkHandler;
|
||||
import net.server.channel.handlers.NewYearCardHandler;
|
||||
import net.server.channel.handlers.NoteActionHandler;
|
||||
import net.server.channel.handlers.OpenFamilyHandler;
|
||||
import net.server.channel.handlers.OpenFamilyPedigreeHandler;
|
||||
import net.server.channel.handlers.OwlWarpHandler;
|
||||
import net.server.channel.handlers.PartyOperationHandler;
|
||||
import net.server.channel.handlers.PartySearchRegisterHandler;
|
||||
import net.server.channel.handlers.PartySearchStartHandler;
|
||||
import net.server.channel.handlers.PartySearchUpdateHandler;
|
||||
import net.server.channel.handlers.PetAutoPotHandler;
|
||||
import net.server.channel.handlers.PetChatHandler;
|
||||
import net.server.channel.handlers.PetCommandHandler;
|
||||
import net.server.channel.handlers.PetExcludeItemsHandler;
|
||||
import net.server.channel.handlers.PetFoodHandler;
|
||||
import net.server.channel.handlers.PetLootHandler;
|
||||
import net.server.channel.handlers.PlayerInteractionHandler;
|
||||
import net.server.channel.handlers.PlayerLoggedinHandler;
|
||||
import net.server.channel.handlers.PlayerMapTransitionHandler;
|
||||
import net.server.channel.handlers.QuestActionHandler;
|
||||
import net.server.channel.handlers.QuickslotKeyMappedModifiedHandler;
|
||||
import net.server.channel.handlers.RPSActionHandler;
|
||||
import net.server.channel.handlers.RaiseIncExpHandler;
|
||||
import net.server.channel.handlers.RaiseUIStateHandler;
|
||||
import net.server.channel.handlers.RangedAttackHandler;
|
||||
import net.server.channel.handlers.ReactorHitHandler;
|
||||
import net.server.channel.handlers.RemoteGachaponHandler;
|
||||
import net.server.channel.handlers.RemoteStoreHandler;
|
||||
import net.server.channel.handlers.ReportHandler;
|
||||
import net.server.channel.handlers.RingActionHandler;
|
||||
import net.server.channel.handlers.ScriptedItemHandler;
|
||||
import net.server.channel.handlers.ScrollHandler;
|
||||
import net.server.channel.handlers.SkillBookHandler;
|
||||
import net.server.channel.handlers.SkillEffectHandler;
|
||||
import net.server.channel.handlers.SkillMacroHandler;
|
||||
import net.server.channel.handlers.SnowballHandler;
|
||||
import net.server.channel.handlers.SpawnPetHandler;
|
||||
import net.server.channel.handlers.SpecialMoveHandler;
|
||||
import net.server.channel.handlers.SpouseChatHandler;
|
||||
import net.server.channel.handlers.StorageHandler;
|
||||
import net.server.channel.handlers.SummonDamageHandler;
|
||||
import net.server.channel.handlers.TakeDamageHandler;
|
||||
import net.server.channel.handlers.TouchMonsterDamageHandler;
|
||||
import net.server.channel.handlers.TouchReactorHandler;
|
||||
import net.server.channel.handlers.TouchingCashShopHandler;
|
||||
import net.server.channel.handlers.TransferNameHandler;
|
||||
import net.server.channel.handlers.TransferNameResultHandler;
|
||||
import net.server.channel.handlers.TransferWorldHandler;
|
||||
import net.server.channel.handlers.TrockAddMapHandler;
|
||||
import net.server.channel.handlers.UseCashItemHandler;
|
||||
import net.server.channel.handlers.UseCatchItemHandler;
|
||||
import net.server.channel.handlers.UseChairHandler;
|
||||
import net.server.channel.handlers.UseDeathItemHandler;
|
||||
import net.server.channel.handlers.UseGachaExpHandler;
|
||||
import net.server.channel.handlers.UseHammerHandler;
|
||||
import net.server.channel.handlers.UseItemEffectHandler;
|
||||
import net.server.channel.handlers.UseItemHandler;
|
||||
import net.server.channel.handlers.UseMapleLifeHandler;
|
||||
import net.server.channel.handlers.UseMountFoodHandler;
|
||||
import net.server.channel.handlers.UseOwlOfMinervaHandler;
|
||||
import net.server.channel.handlers.UseSolomonHandler;
|
||||
import net.server.channel.handlers.UseSummonBagHandler;
|
||||
import net.server.channel.handlers.UseWaterOfLifeHandler;
|
||||
import net.server.channel.handlers.WeddingHandler;
|
||||
import net.server.channel.handlers.WeddingTalkHandler;
|
||||
import net.server.channel.handlers.WeddingTalkMoreHandler;
|
||||
import net.server.channel.handlers.WhisperHandler;
|
||||
import net.server.handlers.CustomPacketHandler;
|
||||
import net.server.handlers.KeepAliveHandler;
|
||||
import net.server.handlers.LoginRequiringNoOpHandler;
|
||||
import net.server.handlers.login.*;
|
||||
import net.server.handlers.login.AcceptToSHandler;
|
||||
import net.server.handlers.login.AfterLoginHandler;
|
||||
import net.server.handlers.login.CharSelectedHandler;
|
||||
import net.server.handlers.login.CharSelectedWithPicHandler;
|
||||
import net.server.handlers.login.CharlistRequestHandler;
|
||||
import net.server.handlers.login.CheckCharNameHandler;
|
||||
import net.server.handlers.login.CreateCharHandler;
|
||||
import net.server.handlers.login.DeleteCharHandler;
|
||||
import net.server.handlers.login.GuestLoginHandler;
|
||||
import net.server.handlers.login.LoginPasswordHandler;
|
||||
import net.server.handlers.login.RegisterPicHandler;
|
||||
import net.server.handlers.login.RegisterPinHandler;
|
||||
import net.server.handlers.login.RelogRequestHandler;
|
||||
import net.server.handlers.login.ServerStatusRequestHandler;
|
||||
import net.server.handlers.login.ServerlistRequestHandler;
|
||||
import net.server.handlers.login.SetGenderHandler;
|
||||
import net.server.handlers.login.ViewAllCharHandler;
|
||||
import net.server.handlers.login.ViewAllCharRegisterPicHandler;
|
||||
import net.server.handlers.login.ViewAllCharSelectedHandler;
|
||||
import net.server.handlers.login.ViewAllCharSelectedWithPicHandler;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user