From 7dc3a2159a9a92125a638983af4b9cf99e64f851 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:09:45 +0200 Subject: [PATCH] Rename and clean up MapleCharacter --- scripts/npc/changeName.js | 4 +- src/main/java/client/BuddyList.java | 2 +- .../{MapleCharacter.java => Character.java} | 2863 +++++++++-------- src/main/java/client/MapleClient.java | 18 +- src/main/java/client/MapleFamily.java | 4 +- src/main/java/client/MapleFamilyEntry.java | 20 +- src/main/java/client/MapleMount.java | 4 +- src/main/java/client/MapleRing.java | 2 +- .../java/client/autoban/AutobanFactory.java | 10 +- .../java/client/autoban/AutobanManager.java | 8 +- .../command/commands/gm0/GmCommand.java | 8 +- .../commands/gm0/JoinEventCommand.java | 4 +- .../commands/gm0/LeaveEventCommand.java | 4 +- .../commands/gm0/MapOwnerClaimCommand.java | 4 +- .../command/commands/gm0/OnlineCommand.java | 8 +- .../command/commands/gm0/RanksCommand.java | 4 +- .../command/commands/gm0/RatesCommand.java | 4 +- .../commands/gm0/ReadPointsCommand.java | 4 +- .../commands/gm0/ReportBugCommand.java | 8 +- .../commands/gm0/ShowRatesCommand.java | 4 +- .../command/commands/gm0/StatDexCommand.java | 4 +- .../command/commands/gm0/StatIntCommand.java | 4 +- .../command/commands/gm0/StatLukCommand.java | 4 +- .../command/commands/gm0/StatStrCommand.java | 4 +- .../command/commands/gm1/BossHpCommand.java | 4 +- .../command/commands/gm1/BuffMeCommand.java | 4 +- .../command/commands/gm1/GotoCommand.java | 4 +- .../command/commands/gm1/MobHpCommand.java | 4 +- .../commands/gm1/WhatDropsFromCommand.java | 4 +- .../command/commands/gm1/WhoDropsCommand.java | 4 +- .../command/commands/gm2/ApCommand.java | 6 +- .../command/commands/gm2/BombCommand.java | 6 +- .../command/commands/gm2/BuffCommand.java | 4 +- .../command/commands/gm2/BuffMapCommand.java | 4 +- .../commands/gm2/ClearDropsCommand.java | 4 +- .../gm2/ClearSavedLocationsCommand.java | 4 +- .../commands/gm2/ClearSlotCommand.java | 4 +- .../command/commands/gm2/DcCommand.java | 6 +- .../commands/gm2/EmpowerMeCommand.java | 4 +- .../command/commands/gm2/HealCommand.java | 4 +- .../command/commands/gm2/HideCommand.java | 4 +- .../command/commands/gm2/IdCommand.java | 4 +- .../command/commands/gm2/ItemCommand.java | 4 +- .../command/commands/gm2/ItemDropCommand.java | 4 +- .../command/commands/gm2/JailCommand.java | 6 +- .../command/commands/gm2/JobCommand.java | 6 +- .../command/commands/gm2/LevelCommand.java | 4 +- .../command/commands/gm2/LevelProCommand.java | 4 +- .../command/commands/gm2/MaxSkillCommand.java | 3 +- .../command/commands/gm2/MaxStatCommand.java | 4 +- .../command/commands/gm2/ReachCommand.java | 6 +- .../command/commands/gm2/RechargeCommand.java | 4 +- .../commands/gm2/ResetSkillCommand.java | 3 +- .../command/commands/gm2/SearchCommand.java | 4 +- .../command/commands/gm2/SetSlotCommand.java | 4 +- .../command/commands/gm2/SetStatCommand.java | 4 +- .../command/commands/gm2/SpCommand.java | 6 +- .../command/commands/gm2/SummonCommand.java | 6 +- .../command/commands/gm2/UnHideCommand.java | 4 +- .../command/commands/gm2/UnJailCommand.java | 6 +- .../command/commands/gm2/WarpAreaCommand.java | 8 +- .../command/commands/gm2/WarpCommand.java | 4 +- .../command/commands/gm2/WarpMapCommand.java | 8 +- .../command/commands/gm2/WhereaMiCommand.java | 12 +- .../command/commands/gm3/BanCommand.java | 12 +- .../command/commands/gm3/ChatCommand.java | 4 +- .../command/commands/gm3/CheckDmgCommand.java | 6 +- .../commands/gm3/ClosePortalCommand.java | 4 +- .../command/commands/gm3/DebuffCommand.java | 6 +- .../command/commands/gm3/EndEventCommand.java | 4 +- .../command/commands/gm3/ExpedsCommand.java | 4 +- .../command/commands/gm3/FaceCommand.java | 6 +- .../command/commands/gm3/FameCommand.java | 6 +- .../command/commands/gm3/FlyCommand.java | 4 +- .../commands/gm3/GiveMesosCommand.java | 6 +- .../command/commands/gm3/GiveNxCommand.java | 6 +- .../command/commands/gm3/GiveRpCommand.java | 6 +- .../command/commands/gm3/GiveVpCommand.java | 6 +- .../command/commands/gm3/HairCommand.java | 6 +- .../command/commands/gm3/HealMapCommand.java | 6 +- .../commands/gm3/HealPersonCommand.java | 6 +- .../command/commands/gm3/HpMpCommand.java | 6 +- .../command/commands/gm3/HurtCommand.java | 6 +- .../command/commands/gm3/IgnoreCommand.java | 6 +- .../command/commands/gm3/IgnoredCommand.java | 6 +- .../command/commands/gm3/InMapCommand.java | 6 +- .../command/commands/gm3/KillAllCommand.java | 4 +- .../command/commands/gm3/KillCommand.java | 6 +- .../command/commands/gm3/KillMapCommand.java | 6 +- .../commands/gm3/MaxEnergyCommand.java | 4 +- .../command/commands/gm3/MaxHpMpCommand.java | 6 +- .../command/commands/gm3/MonitorCommand.java | 6 +- .../command/commands/gm3/MonitorsCommand.java | 6 +- .../command/commands/gm3/MusicCommand.java | 4 +- .../command/commands/gm3/MuteMapCommand.java | 4 +- .../command/commands/gm3/NightCommand.java | 4 +- .../command/commands/gm3/NoticeCommand.java | 4 +- .../command/commands/gm3/NpcCommand.java | 4 +- .../commands/gm3/OnlineTwoCommand.java | 8 +- .../commands/gm3/OpenPortalCommand.java | 4 +- .../command/commands/gm3/PeCommand.java | 4 +- .../command/commands/gm3/PosCommand.java | 4 +- .../commands/gm3/QuestCompleteCommand.java | 4 +- .../commands/gm3/QuestResetCommand.java | 4 +- .../commands/gm3/QuestStartCommand.java | 4 +- .../commands/gm3/ReloadDropsCommand.java | 4 +- .../commands/gm3/ReloadEventsCommand.java | 4 +- .../commands/gm3/ReloadMapCommand.java | 8 +- .../commands/gm3/ReloadPortalsCommand.java | 4 +- .../command/commands/gm3/RipCommand.java | 4 +- .../command/commands/gm3/SeedCommand.java | 4 +- .../command/commands/gm3/SpawnCommand.java | 4 +- .../commands/gm3/StartEventCommand.java | 4 +- .../command/commands/gm3/TimerAllCommand.java | 8 +- .../command/commands/gm3/TimerCommand.java | 6 +- .../command/commands/gm3/TimerMapCommand.java | 8 +- .../commands/gm3/ToggleCouponCommand.java | 4 +- .../command/commands/gm3/UnBanCommand.java | 6 +- .../commands/gm4/BossDropRateCommand.java | 4 +- .../command/commands/gm4/CakeCommand.java | 4 +- .../command/commands/gm4/DropRateCommand.java | 4 +- .../command/commands/gm4/ExpRateCommand.java | 4 +- .../commands/gm4/FishingRateCommand.java | 4 +- .../command/commands/gm4/ForceVacCommand.java | 4 +- .../command/commands/gm4/HorntailCommand.java | 4 +- .../command/commands/gm4/ItemVacCommand.java | 4 +- .../command/commands/gm4/MesoRateCommand.java | 4 +- .../command/commands/gm4/PapCommand.java | 4 +- .../command/commands/gm4/PianusCommand.java | 4 +- .../command/commands/gm4/PinkbeanCommand.java | 4 +- .../commands/gm4/PlayerNpcCommand.java | 4 +- .../commands/gm4/PlayerNpcRemoveCommand.java | 4 +- .../command/commands/gm4/PmobCommand.java | 4 +- .../commands/gm4/PmobRemoveCommand.java | 4 +- .../command/commands/gm4/PnpcCommand.java | 4 +- .../commands/gm4/PnpcRemoveCommand.java | 4 +- .../command/commands/gm4/ProItemCommand.java | 4 +- .../commands/gm4/QuestRateCommand.java | 4 +- .../commands/gm4/ServerMessageCommand.java | 4 +- .../commands/gm4/SetEqStatCommand.java | 4 +- .../commands/gm4/TravelRateCommand.java | 4 +- .../command/commands/gm4/ZakumCommand.java | 4 +- .../command/commands/gm5/DebugCommand.java | 6 +- .../command/commands/gm5/IpListCommand.java | 6 +- .../commands/gm6/ClearQuestCacheCommand.java | 4 +- .../commands/gm6/ClearQuestCommand.java | 4 +- .../command/commands/gm6/DCAllCommand.java | 6 +- .../command/commands/gm6/GetAccCommand.java | 6 +- .../commands/gm6/MapPlayersCommand.java | 6 +- .../command/commands/gm6/SaveAllCommand.java | 6 +- .../commands/gm6/ServerAddChannelCommand.java | 4 +- .../commands/gm6/ServerAddWorldCommand.java | 4 +- .../gm6/ServerRemoveChannelCommand.java | 4 +- .../gm6/ServerRemoveWorldCommand.java | 4 +- .../commands/gm6/SetGmLevelCommand.java | 6 +- .../command/commands/gm6/ShutdownCommand.java | 6 +- .../commands/gm6/SpawnAllPNpcsCommand.java | 4 +- .../commands/gm6/SupplyRateCouponCommand.java | 4 +- .../commands/gm6/WarpWorldCommand.java | 4 +- .../java/client/creator/CharacterFactory.java | 6 +- src/main/java/client/inventory/Inventory.java | 22 +- .../java/client/inventory/InventoryProof.java | 4 +- src/main/java/client/inventory/Pet.java | 10 +- .../manipulator/InventoryManipulator.java | 22 +- .../client/newyear/NewYearCardRecord.java | 14 +- .../processor/action/BuybackProcessor.java | 4 +- .../processor/action/MakerProcessor.java | 4 +- .../processor/action/PetAutopotProcessor.java | 6 +- .../processor/action/SpawnPetProcessor.java | 4 +- .../client/processor/npc/DueyProcessor.java | 8 +- .../processor/npc/FredrickProcessor.java | 12 +- .../processor/npc/StorageProcessor.java | 4 +- .../processor/stat/AssignAPProcessor.java | 11 +- .../processor/stat/AssignSPProcessor.java | 6 +- .../constants/string/LanguageConstants.java | 4 +- .../java/net/packet/logging/MapleLogger.java | 14 +- src/main/java/net/server/PlayerStorage.java | 29 +- src/main/java/net/server/Server.java | 62 +- src/main/java/net/server/channel/Channel.java | 26 +- .../handlers/AbstractDealDamageHandler.java | 9 +- .../channel/handlers/AcceptFamilyHandler.java | 6 +- .../channel/handlers/AdminCommandHandler.java | 10 +- .../handlers/AllianceOperationHandler.java | 14 +- .../channel/handlers/AranComboHandler.java | 4 +- .../channel/handlers/AutoAggroHandler.java | 4 +- .../channel/handlers/BBSOperationHandler.java | 12 +- .../handlers/BuddylistModifyHandler.java | 9 +- .../channel/handlers/CancelChairHandler.java | 4 +- .../handlers/CashOperationHandler.java | 26 +- .../channel/handlers/ChangeMapHandler.java | 4 +- .../handlers/CharInfoRequestHandler.java | 6 +- .../handlers/CloseRangeDamageHandler.java | 3 +- .../channel/handlers/CouponCodeHandler.java | 6 +- .../channel/handlers/DamageSummonHandler.java | 4 +- .../handlers/DenyAllianceRequestHandler.java | 4 +- .../handlers/DenyGuildRequestHandler.java | 4 +- .../handlers/DenyPartyRequestHandler.java | 6 +- .../server/channel/handlers/DoorHandler.java | 4 +- .../handlers/EnterCashShopHandler.java | 4 +- .../channel/handlers/EnterMTSHandler.java | 4 +- .../handlers/FaceExpressionHandler.java | 4 +- .../channel/handlers/FamilyAddHandler.java | 6 +- .../handlers/FamilySummonResponseHandler.java | 4 +- .../channel/handlers/FamilyUseHandler.java | 4 +- .../handlers/FieldDamageMobHandler.java | 4 +- .../channel/handlers/FredrickHandler.java | 4 +- .../channel/handlers/GeneralChatHandler.java | 4 +- .../channel/handlers/GiveFameHandler.java | 8 +- .../handlers/GrenadeEffectHandler.java | 4 +- .../handlers/GuildOperationHandler.java | 12 +- .../channel/handlers/HealOvertimeHandler.java | 4 +- .../handlers/HiredMerchantRequest.java | 8 +- .../handlers/InventoryMergeHandler.java | 4 +- .../handlers/InventorySortHandler.java | 4 +- .../channel/handlers/ItemPickupHandler.java | 4 +- .../server/channel/handlers/MTSHandler.java | 6 +- .../channel/handlers/MagicDamageHandler.java | 3 +- .../channel/handlers/MesoDropHandler.java | 4 +- .../channel/handlers/MessengerHandler.java | 6 +- .../handlers/MobBanishPlayerHandler.java | 4 +- .../channel/handlers/MobDamageMobHandler.java | 4 +- .../handlers/MonsterCarnivalHandler.java | 6 +- .../channel/handlers/MoveDragonHandler.java | 4 +- .../channel/handlers/MoveLifeHandler.java | 8 +- .../channel/handlers/MovePetHandler.java | 4 +- .../channel/handlers/MoveSummonHandler.java | 4 +- .../channel/handlers/MultiChatHandler.java | 4 +- .../channel/handlers/NewYearCardHandler.java | 8 +- .../channel/handlers/OpenFamilyHandler.java | 4 +- .../handlers/OpenFamilyPedigreeHandler.java | 4 +- .../handlers/PartyOperationHandler.java | 8 +- .../handlers/PartySearchStartHandler.java | 4 +- .../channel/handlers/PetAutoPotHandler.java | 4 +- .../channel/handlers/PetCommandHandler.java | 4 +- .../handlers/PetExcludeItemsHandler.java | 4 +- .../channel/handlers/PetFoodHandler.java | 4 +- .../channel/handlers/PetLootHandler.java | 4 +- .../handlers/PlayerInteractionHandler.java | 18 +- .../handlers/PlayerLoggedinHandler.java | 9 +- .../handlers/PlayerMapTransitionHandler.java | 4 +- .../channel/handlers/QuestActionHandler.java | 6 +- .../channel/handlers/RPSActionHandler.java | 4 +- .../channel/handlers/RaiseIncExpHandler.java | 4 +- .../channel/handlers/RaiseUIStateHandler.java | 6 +- .../channel/handlers/RangedAttackHandler.java | 3 +- .../channel/handlers/RemoteStoreHandler.java | 4 +- .../channel/handlers/ReportHandler.java | 6 +- .../channel/handlers/RingActionHandler.java | 38 +- .../channel/handlers/ScrollHandler.java | 4 +- .../channel/handlers/SkillBookHandler.java | 4 +- .../channel/handlers/SkillMacroHandler.java | 4 +- .../channel/handlers/SnowballHandler.java | 4 +- .../channel/handlers/SpecialMoveHandler.java | 4 +- .../channel/handlers/SpouseChatHandler.java | 4 +- .../channel/handlers/SummonDamageHandler.java | 6 +- .../channel/handlers/TakeDamageHandler.java | 7 +- .../handlers/TouchMonsterDamageHandler.java | 4 +- .../channel/handlers/TransferNameHandler.java | 4 +- .../handlers/TransferNameResultHandler.java | 4 +- .../handlers/TransferWorldHandler.java | 4 +- .../channel/handlers/TrockAddMapHandler.java | 4 +- .../channel/handlers/UseCashItemHandler.java | 9 +- .../channel/handlers/UseCatchItemHandler.java | 4 +- .../channel/handlers/UseItemHandler.java | 6 +- .../channel/handlers/UseMapleLifeHandler.java | 6 +- .../channel/handlers/UseMountFoodHandler.java | 4 +- .../channel/handlers/UseSolomonHandler.java | 4 +- .../channel/handlers/WeddingHandler.java | 6 +- .../channel/handlers/WhisperHandler.java | 8 +- .../login/MapleLoginBypassCoordinator.java | 4 +- .../AbstractMatchCheckerListener.java | 10 +- .../MapleMatchCheckerCoordinator.java | 22 +- .../listener/MatchCheckerCPQChallenge.java | 37 +- .../listener/MatchCheckerGuildCreation.java | 32 +- .../MaplePartySearchCoordinator.java | 64 +- .../partysearch/PartySearchCharacter.java | 14 +- .../partysearch/PartySearchEchelon.java | 25 +- .../partysearch/PartySearchStorage.java | 26 +- .../session/SessionCoordinator.java | 4 +- .../world/MapleInviteCoordinator.java | 20 +- .../world/MapleMonsterAggroCoordinator.java | 8 +- .../java/net/server/guild/GuildPackets.java | 10 +- .../java/net/server/guild/MapleAlliance.java | 24 +- .../java/net/server/guild/MapleGuild.java | 22 +- .../net/server/guild/MapleGuildCharacter.java | 12 +- .../handlers/login/CheckCharNameHandler.java | 4 +- .../handlers/login/ViewAllCharHandler.java | 12 +- .../task/channel/FaceExpressionService.java | 6 +- .../server/task/CharacterAutosaverTask.java | 6 +- .../java/net/server/task/TimeoutTask.java | 6 +- .../server/world/MapleMessengerCharacter.java | 4 +- .../java/net/server/world/MapleParty.java | 14 +- .../net/server/world/MaplePartyCharacter.java | 8 +- src/main/java/net/server/world/World.java | 132 +- .../scripting/AbstractPlayerInteraction.java | 37 +- .../scripting/event/EventInstanceManager.java | 144 +- .../java/scripting/event/EventManager.java | 24 +- .../java/scripting/map/MapScriptManager.java | 4 +- .../java/scripting/map/MapScriptMethods.java | 2 +- .../scripting/npc/NPCConversationManager.java | 55 +- .../java/scripting/npc/NPCScriptManager.java | 14 +- .../reactor/ReactorActionManager.java | 10 +- .../server/MapleItemInformationProvider.java | 11 +- src/main/java/server/MapleMarriage.java | 6 +- .../MapleSkillbookInformationProvider.java | 4 +- src/main/java/server/MapleStatEffect.java | 61 +- src/main/java/server/MapleTrade.java | 26 +- src/main/java/server/events/RescueGaga.java | 4 +- .../java/server/events/gm/MapleCoconut.java | 16 +- .../java/server/events/gm/MapleFitness.java | 6 +- src/main/java/server/events/gm/MapleOla.java | 6 +- .../java/server/events/gm/MapleOxQuiz.java | 10 +- .../java/server/events/gm/MapleSnowball.java | 14 +- .../server/expeditions/MapleExpedition.java | 54 +- src/main/java/server/life/MapleMonster.java | 159 +- src/main/java/server/life/MaplePlayerNPC.java | 16 +- src/main/java/server/life/MobSkill.java | 12 +- .../java/server/life/MonsterListener.java | 4 +- src/main/java/server/life/SpawnPoint.java | 9 +- .../java/server/loot/MapleLootInventory.java | 4 +- .../java/server/loot/MapleLootManager.java | 15 +- src/main/java/server/maps/MapleDoor.java | 20 +- .../java/server/maps/MapleDoorObject.java | 8 +- src/main/java/server/maps/MapleDragon.java | 8 +- .../java/server/maps/MapleGenericPortal.java | 4 +- .../java/server/maps/MapleHiredMerchant.java | 50 +- src/main/java/server/maps/MapleKite.java | 8 +- src/main/java/server/maps/MapleMap.java | 244 +- src/main/java/server/maps/MapleMapItem.java | 14 +- .../java/server/maps/MapleMiniDungeon.java | 12 +- src/main/java/server/maps/MapleMiniGame.java | 30 +- src/main/java/server/maps/MapleMist.java | 8 +- .../java/server/maps/MaplePlayerShop.java | 46 +- src/main/java/server/maps/MapleSummon.java | 8 +- src/main/java/server/maps/MapleTVEffect.java | 6 +- .../server/partyquest/AriantColiseum.java | 38 +- .../server/partyquest/MonsterCarnival.java | 42 +- .../partyquest/MonsterCarnivalParty.java | 28 +- .../java/server/partyquest/PartyQuest.java | 19 +- src/main/java/server/partyquest/Pyramid.java | 16 +- src/main/java/server/quest/MapleQuest.java | 28 +- .../java/server/quest/actions/BuffAction.java | 6 +- .../java/server/quest/actions/ExpAction.java | 6 +- .../java/server/quest/actions/FameAction.java | 4 +- .../java/server/quest/actions/InfoAction.java | 5 +- .../java/server/quest/actions/ItemAction.java | 14 +- .../quest/actions/MapleQuestAction.java | 6 +- .../java/server/quest/actions/MesoAction.java | 6 +- .../server/quest/actions/NextQuestAction.java | 4 +- .../server/quest/actions/PetSkillAction.java | 6 +- .../server/quest/actions/PetSpeedAction.java | 4 +- .../quest/actions/PetTamenessAction.java | 4 +- .../server/quest/actions/QuestAction.java | 9 +- .../server/quest/actions/SkillAction.java | 13 +- .../requirements/BuffExceptRequirement.java | 4 +- .../quest/requirements/BuffRequirement.java | 4 +- .../CompletedQuestRequirement.java | 4 +- .../requirements/EndDateRequirement.java | 7 +- .../requirements/FieldEnterRequirement.java | 4 +- .../quest/requirements/InfoExRequirement.java | 9 +- .../requirements/InfoNumberRequirement.java | 4 +- .../requirements/IntervalRequirement.java | 6 +- .../quest/requirements/ItemRequirement.java | 4 +- .../quest/requirements/JobRequirement.java | 12 +- .../requirements/MapleQuestRequirement.java | 6 +- .../requirements/MaxLevelRequirement.java | 4 +- .../quest/requirements/MesoRequirement.java | 4 +- .../requirements/MinLevelRequirement.java | 4 +- .../requirements/MinTamenessRequirement.java | 4 +- .../quest/requirements/MobRequirement.java | 12 +- .../MonsterBookCountRequirement.java | 4 +- .../quest/requirements/NpcRequirement.java | 4 +- .../quest/requirements/PetRequirement.java | 4 +- .../quest/requirements/QuestRequirement.java | 12 +- .../quest/requirements/ScriptRequirement.java | 4 +- src/main/java/tools/LogHelper.java | 6 +- src/main/java/tools/PacketCreator.java | 197 +- src/main/java/tools/packets/Fishing.java | 6 +- .../java/tools/packets/WeddingPackets.java | 16 +- 379 files changed, 3418 insertions(+), 3373 deletions(-) rename src/main/java/client/{MapleCharacter.java => Character.java} (91%) diff --git a/scripts/npc/changeName.js b/scripts/npc/changeName.js index a684dc9b1e..add15d283d 100644 --- a/scripts/npc/changeName.js +++ b/scripts/npc/changeName.js @@ -47,8 +47,8 @@ function action(mode, type, selection) { } else if(status == 2) { var text = cm.getText(); - const MapleCharacter = Java.type('client.MapleCharacter'); - var canCreate = MapleCharacter.canCreateChar(text); + const Character = Java.type('client.Character'); + var canCreate = Character.canCreateChar(text); if(canCreate) { cm.getPlayer().setName(text); cm.sendOk("Your name has been changed to #b" + text + "#k. You will have to login again for this to take effect.", 1); diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index f7579c5b9a..10e45d5627 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -129,7 +129,7 @@ public class BuddyList { public void broadcast(Packet packet, PlayerStorage pstorage) { for(int bid : getBuddyIds()) { - MapleCharacter chr = pstorage.getCharacterById(bid); + Character chr = pstorage.getCharacterById(bid); if(chr != null && chr.isLoggedinWorld()) { chr.sendPacket(packet); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/Character.java similarity index 91% rename from src/main/java/client/MapleCharacter.java rename to src/main/java/client/Character.java index 5d436890ab..fbfe8b610d 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/Character.java @@ -93,13 +93,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.regex.Pattern; -public class MapleCharacter extends AbstractMapleCharacterObject { +public class Character extends AbstractMapleCharacterObject { private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); private static final String LEVEL_200 = "[Congrats] %s has reached Level %d! Congratulate %s on such an amazing achievement!"; private static final String[] BLOCKED_NAMES = {"admin", "owner", "moderator", "intern", "donor", "administrator", "FREDRICK", "help", "helper", "alert", "notice", "maplestory", "fuck", "wizet", "fucking", "negro", "fuk", "fuc", "penis", "pussy", "asshole", "gay", - "nigger", "homo", "suck", "cum", "shit", "shitty", "condom", "security", "official", "rape", "nigga", "sex", "tit", "boner", "orgy", "clit", "asshole", "fatass", "bitch", "support", "gamemaster", "cock", "gaay", "gm", - "operate", "master", "sysop", "party", "GameMaster", "community", "message", "event", "test", "meso", "Scania", "yata", "AsiaSoft", "henesys"}; - + "nigger", "homo", "suck", "cum", "shit", "shitty", "condom", "security", "official", "rape", "nigga", "sex", "tit", "boner", "orgy", "clit", "asshole", "fatass", "bitch", "support", "gamemaster", "cock", "gaay", "gm", + "operate", "master", "sysop", "party", "GameMaster", "community", "message", "event", "test", "meso", "Scania", "yata", "AsiaSoft", "henesys"}; + private int world; private int accountid, id, level; private int rank, rankMove, jobRank, jobRankMove; @@ -142,12 +142,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private String commandtext; private String dataString; private String search = null; - private AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map - private AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts - private AtomicInteger exp = new AtomicInteger(); - private AtomicInteger gachaexp = new AtomicInteger(); - private AtomicInteger meso = new AtomicInteger(); - private AtomicInteger chair = new AtomicInteger(-1); + private final AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map + private final AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts + private final AtomicInteger exp = new AtomicInteger(); + private final AtomicInteger gachaexp = new AtomicInteger(); + private final AtomicInteger meso = new AtomicInteger(); + private final AtomicInteger chair = new AtomicInteger(-1); private int merchantmeso; private BuddyList buddylist; private EventInstanceManager eventInstance = null; @@ -162,7 +162,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private MapleRockPaperScissor rps; private MapleMount maplemount; private MapleParty party; - private Pet[] pets = new Pet[3]; + private final Pet[] pets = new Pet[3]; private MaplePlayerShop playerShop = null; private MapleShop shop = null; private MapleSkinColor skinColor = MapleSkinColor.NORMAL; @@ -170,28 +170,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private MapleTrade trade = null; private MonsterBook monsterbook; private CashShop cashshop; - private Set newyears = new LinkedHashSet<>(); - private SavedLocation savedLocations[]; - private SkillMacro[] skillMacros = new SkillMacro[5]; + private final Set newyears = new LinkedHashSet<>(); + private final SavedLocation[] savedLocations; + private final SkillMacro[] skillMacros = new SkillMacro[5]; private List lastmonthfameids; - private List> lastVisitedMaps = new LinkedList<>(); + private final List> lastVisitedMaps = new LinkedList<>(); private WeakReference ownedMap = new WeakReference<>(null); private final Map quests; - private Set controlled = new LinkedHashSet<>(); - private Map entered = new LinkedHashMap<>(); - private Set visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>()); - private Map skills = new LinkedHashMap<>(); - private Map activeCoupons = new LinkedHashMap<>(); - private Map activeCouponRates = new LinkedHashMap<>(); - private EnumMap effects = new EnumMap<>(BuffStat.class); - private Map buffEffectsCount = new LinkedHashMap<>(); - private Map diseaseExpires = new LinkedHashMap<>(); - private Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan - private Map buffExpires = new LinkedHashMap<>(); - private Map keymap = new LinkedHashMap<>(); - private Map summons = new LinkedHashMap<>(); - private Map coolDowns = new LinkedHashMap<>(); - private EnumMap> diseases = new EnumMap<>(MapleDisease.class); + private final Set controlled = new LinkedHashSet<>(); + private final Map entered = new LinkedHashMap<>(); + private final Set visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>()); + private final Map skills = new LinkedHashMap<>(); + private final Map activeCoupons = new LinkedHashMap<>(); + private final Map activeCouponRates = new LinkedHashMap<>(); + private final EnumMap effects = new EnumMap<>(BuffStat.class); + private final Map buffEffectsCount = new LinkedHashMap<>(); + private final Map diseaseExpires = new LinkedHashMap<>(); + private final Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan + private final Map buffExpires = new LinkedHashMap<>(); + private final Map keymap = new LinkedHashMap<>(); + private final Map summons = new LinkedHashMap<>(); + private final Map coolDowns = new LinkedHashMap<>(); + private final EnumMap> diseases = new EnumMap<>(MapleDisease.class); private byte[] m_aQuickslotLoaded; private QuickslotBinding m_pQuickslotKeyMapped; private MapleDoor pdoor = null; @@ -209,36 +209,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private ScheduledFuture chairRecoveryTask = null; private ScheduledFuture pendantOfSpirit = null; //1122017 private ScheduledFuture cpqSchedule = null; - private Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true); - private Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true); - private Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true); - private Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT); - private Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN); - private Map> excluded = new LinkedHashMap<>(); - private Set excludedItems = new LinkedHashSet<>(); - private Set disabledPartySearchInvites = new LinkedHashSet<>(); - private static String[] ariantroomleader = new String[3]; - private static int[] ariantroomslot = new int[3]; + private final Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true); + private final Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true); + private final Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true); + private final Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT); + private final Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN); + private final Map> excluded = new LinkedHashMap<>(); + private final Set excludedItems = new LinkedHashSet<>(); + private final Set disabledPartySearchInvites = new LinkedHashSet<>(); + private static final String[] ariantroomleader = new String[3]; + private static final int[] ariantroomslot = new int[3]; private long portaldelay = 0, lastcombo = 0; private short combocounter = 0; - private List blockedPortals = new ArrayList<>(); - private Map area_info = new LinkedHashMap<>(); + private final List blockedPortals = new ArrayList<>(); + private final Map area_info = new LinkedHashMap<>(); private AutobanManager autoban; private boolean isbanned = false; private boolean blockCashShop = false; private boolean allowExpGain = true; private byte pendantExp = 0, lastmobcount = 0, doorSlot = -1; - private List trockmaps = new ArrayList<>(); - private List viptrockmaps = new ArrayList<>(); + private final List trockmaps = new ArrayList<>(); + private final List viptrockmaps = new ArrayList<>(); private Map events = new LinkedHashMap<>(); private PartyQuest partyQuest = null; - private List> npcUpdateQuests = new LinkedList<>(); + private final List> npcUpdateQuests = new LinkedList<>(); private MapleDragon dragon = null; private MapleRing marriageRing; private int marriageItemid = -1; private int partnerId = -1; - private List crushRings = new ArrayList<>(); - private List friendshipRings = new ArrayList<>(); + private final List crushRings = new ArrayList<>(); + private final List friendshipRings = new ArrayList<>(); private boolean loggedIn = false; private boolean useCS; //chaos scroll upon crafting item. private long npcCd; @@ -258,14 +258,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private boolean pendingNameChange; //only used to change name on logout, not to be relied upon elsewhere private long loginTime; private boolean chasing = false; - - private MapleCharacter() { + + private Character() { super.setListener(new AbstractCharacterListener() { @Override public void onHpChanged(int oldHp) { hpChangeAction(oldHp); } - + @Override public void onHpmpPoolUpdate() { List> hpmpupdate = recalcLocalStats(); @@ -283,12 +283,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statUpdates.put(MapleStat.MP, mp); } } - + @Override public void onStatUpdate() { recalcLocalStats(); } - + @Override public void onAnnounceStatPoolUpdate() { List> statup = new ArrayList<>(8); @@ -296,68 +296,68 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(s.getKey(), s.getValue())); } - sendPacket(PacketCreator.updatePlayerStats(statup, true, MapleCharacter.this)); + sendPacket(PacketCreator.updatePlayerStats(statup, true, Character.this)); } }); - + useCS = false; - + setStance(0); inventory = new Inventory[InventoryType.values().length]; savedLocations = new SavedLocation[SavedLocationType.values().length]; - + for (InventoryType type : InventoryType.values()) { byte b = 24; if (type == InventoryType.CASH) { b = 96; } - inventory[type.ordinal()] = new Inventory(this, type, (byte) b); + inventory[type.ordinal()] = new Inventory(this, type, b); } inventory[InventoryType.CANHOLD.ordinal()] = new InventoryProof(this); - + for (int i = 0; i < SavedLocationType.values().length; i++) { savedLocations[i] = null; } quests = new LinkedHashMap<>(); setPosition(new Point(0, 0)); } - + private static MapleJob getJobStyleInternal(int jobid, byte opt) { int jobtype = jobid / 100; - - if(jobtype == MapleJob.WARRIOR.getId() / 100 || jobtype == MapleJob.DAWNWARRIOR1.getId() / 100 || jobtype == MapleJob.ARAN1.getId() / 100) { - return(MapleJob.WARRIOR); - } else if(jobtype == MapleJob.MAGICIAN.getId() / 100 || jobtype == MapleJob.BLAZEWIZARD1.getId() / 100 || jobtype == MapleJob.EVAN1.getId() / 100) { - return(MapleJob.MAGICIAN); - } else if(jobtype == MapleJob.BOWMAN.getId() / 100 || jobtype == MapleJob.WINDARCHER1.getId() / 100) { - if(jobid / 10 == MapleJob.CROSSBOWMAN.getId() / 10) { - return(MapleJob.CROSSBOWMAN); + + if (jobtype == MapleJob.WARRIOR.getId() / 100 || jobtype == MapleJob.DAWNWARRIOR1.getId() / 100 || jobtype == MapleJob.ARAN1.getId() / 100) { + return (MapleJob.WARRIOR); + } else if (jobtype == MapleJob.MAGICIAN.getId() / 100 || jobtype == MapleJob.BLAZEWIZARD1.getId() / 100 || jobtype == MapleJob.EVAN1.getId() / 100) { + return (MapleJob.MAGICIAN); + } else if (jobtype == MapleJob.BOWMAN.getId() / 100 || jobtype == MapleJob.WINDARCHER1.getId() / 100) { + if (jobid / 10 == MapleJob.CROSSBOWMAN.getId() / 10) { + return (MapleJob.CROSSBOWMAN); } else { - return(MapleJob.BOWMAN); + return (MapleJob.BOWMAN); } - } else if(jobtype == MapleJob.THIEF.getId() / 100 || jobtype == MapleJob.NIGHTWALKER1.getId() / 100) { - return(MapleJob.THIEF); - } else if(jobtype == MapleJob.PIRATE.getId() / 100 || jobtype == MapleJob.THUNDERBREAKER1.getId() / 100) { - if(opt == (byte) 0x80) { - return(MapleJob.BRAWLER); + } else if (jobtype == MapleJob.THIEF.getId() / 100 || jobtype == MapleJob.NIGHTWALKER1.getId() / 100) { + return (MapleJob.THIEF); + } else if (jobtype == MapleJob.PIRATE.getId() / 100 || jobtype == MapleJob.THUNDERBREAKER1.getId() / 100) { + if (opt == (byte) 0x80) { + return (MapleJob.BRAWLER); } else { - return(MapleJob.GUNSLINGER); + return (MapleJob.GUNSLINGER); } } - - return(MapleJob.BEGINNER); + + return (MapleJob.BEGINNER); } - + public MapleJob getJobStyle(byte opt) { return getJobStyleInternal(this.getJob().getId(), opt); } - + public MapleJob getJobStyle() { return getJobStyle((byte) ((this.getStr() > this.getDex()) ? 0x80 : 0x40)); } - public static MapleCharacter getDefault(MapleClient c) { - MapleCharacter ret = new MapleCharacter(); + public static Character getDefault(MapleClient c) { + Character ret = new Character(); ret.client = c; ret.setGMLevel(0); ret.hp = 50; @@ -378,13 +378,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.getInventory(InventoryType.USE).setSlotLimit(24); ret.getInventory(InventoryType.SETUP).setSlotLimit(24); ret.getInventory(InventoryType.ETC).setSlotLimit(24); - + // Select a keybinding method int[] selectedKey; int[] selectedType; int[] selectedAction; - - if(YamlConfig.config.server.USE_CUSTOM_KEYSET) { + + if (YamlConfig.config.server.USE_CUSTOM_KEYSET) { selectedKey = GameConstants.getCustomKey(true); selectedType = GameConstants.getCustomType(true); selectedAction = GameConstants.getCustomAction(true); @@ -393,12 +393,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { selectedType = GameConstants.getCustomType(false); selectedAction = GameConstants.getCustomAction(false); } - + for (int i = 0; i < selectedKey.length; i++) { ret.keymap.put(selectedKey[i], new KeyBinding(selectedType[i], selectedAction[i])); } - - + + //to fix the map 0 lol for (int i = 0; i < 5; i++) { ret.trockmaps.add(999999999); @@ -409,42 +409,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ret; } - + public boolean isLoggedinWorld() { return this.isLoggedin() && !this.isAwayFromWorld(); } - + public boolean isAwayFromWorld() { return awayFromWorld.get(); } - + public void setEnteredChannelWorld() { awayFromWorld.set(false); client.getChannelServer().removePlayerAway(id); - + if (canRecvPartySearchInvite) { this.getWorldServer().getPartySearchCoordinator().attachPlayer(this); } } - + public void setAwayFromChannelWorld() { setAwayFromChannelWorld(false); } - + public void setDisconnectedFromChannelWorld() { setAwayFromChannelWorld(true); } - + private void setAwayFromChannelWorld(boolean disconnect) { awayFromWorld.set(true); - - if(!disconnect) { + + if (!disconnect) { client.getChannelServer().insertPlayerAway(id); } else { client.getChannelServer().removePlayerAway(id); } } - + public void updatePartySearchAvailability(boolean psearchAvailable) { if (psearchAvailable) { if (canRecvPartySearchInvite && getParty() == null) { @@ -456,59 +456,59 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public boolean toggleRecvPartySearchInvite() { canRecvPartySearchInvite = !canRecvPartySearchInvite; - + if (canRecvPartySearchInvite) { updatePartySearchAvailability(getParty() == null); } else { this.getWorldServer().getPartySearchCoordinator().detachPlayer(this); } - + return canRecvPartySearchInvite; } - + public boolean isRecvPartySearchInviteEnabled() { return canRecvPartySearchInvite; } - + public void resetPartySearchInvite(int fromLeaderid) { disabledPartySearchInvites.remove(fromLeaderid); } - + public void disablePartySearchInvite(int fromLeaderid) { disabledPartySearchInvites.add(fromLeaderid); } - + public boolean hasDisabledPartySearchInvite(int fromLeaderid) { return disabledPartySearchInvites.contains(fromLeaderid); } - + public void setSessionTransitionState() { client.setCharacterOnSessionTransitionState(this.getId()); } - + public boolean getCS() { return useCS; } - + public void setCS(boolean cs) { useCS = cs; } - + public long getNpcCooldown() { return npcCd; } - + public void setNpcCooldown(long d) { npcCd = d; } - + public void setOwlSearch(int id) { owlSearch = id; } - + public int getOwlSearch() { return owlSearch; } @@ -539,8 +539,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ring; } } - - if(marriageRing != null) { + + if (marriageRing != null) { if (marriageRing.getRingId() == id) { return marriageRing; } @@ -548,43 +548,41 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } - + public int getMarriageItemId() { return marriageItemid; } - + public void setMarriageItemId(int itemid) { marriageItemid = itemid; } - + public int getPartnerId() { return partnerId; } - + public void setPartnerId(int partnerid) { partnerId = partnerid; } - + public int getRelationshipId() { return getWorldServer().getRelationshipId(id); } - + public boolean isMarried() { return marriageRing != null && partnerId > 0; } - + public boolean hasJustMarried() { EventInstanceManager eim = getEventInstance(); - if(eim != null) { + if (eim != null) { String prop = eim.getProperty("groomId"); - - if(prop != null) { - if((Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210)) { - return true; - } + + if (prop != null) { + return (Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210); } } - + return false; } @@ -599,7 +597,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return pts; } - + public void addFame(int famechange) { this.fame += famechange; } @@ -607,15 +605,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void addFriendshipRing(MapleRing r) { friendshipRings.add(r); } - + public void addMarriageRing(MapleRing r) { marriageRing = r; } - + public void addMesosTraded(int gain) { this.mesosTraded += gain; } - + public void addPet(Pet pet) { petLock.lock(); try { @@ -629,10 +627,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void addSummon(int id, MapleSummon summon) { summons.put(id, summon); - + if (summon.isPuppet()) { map.addPlayerPuppet(this); } @@ -668,7 +666,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (accountId) { query = "SELECT id FROM accounts WHERE name = ?"; } else { - query ="SELECT accountid FROM characters WHERE name = ?"; + query = "SELECT accountid FROM characters WHERE name = ?"; } boolean ret = false; @@ -692,7 +690,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public int calculateMaxBaseDamage(int watk, WeaponType weapon) { int mainstat, secondarystat; if (getJob().isA(MapleJob.THIEF) && weapon == WeaponType.DAGGER_OTHER) { @@ -732,24 +730,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return maxbasedamage; } - + public int calculateMaxBaseMagicDamage(int matk) { int maxbasedamage = matk; int totalint = getTotalInt(); - + if (totalint > 2000) { maxbasedamage -= 2000; maxbasedamage += (int) ((0.09033024267 * totalint) + 3823.8038); } else { maxbasedamage -= totalint; - + if (totalint > 1700) { maxbasedamage += (int) (0.1996049769 * Math.pow(totalint, 1.300631341)); } else { maxbasedamage += (int) (0.1996049769 * Math.pow(totalint, 1.290631341)); } } - + return (maxbasedamage * 107) / 100; } @@ -782,15 +780,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLastMobCount(byte count) { lastmobcount = count; } - + public boolean cannotEnterCashShop() { return blockCashShop; } - + public void toggleBlockCashShop() { blockCashShop = !blockCashShop; } - + public void toggleExpGain() { allowExpGain = !allowExpGain; } @@ -798,7 +796,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setClient(MapleClient c) { this.client = c; } - + public void newClient(MapleClient c) { this.loggedIn = true; c.setAccountName(this.client.getAccountName());//No null's for accountName @@ -829,11 +827,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { List dsstat = Collections.singletonList(BuffStat.DARKSIGHT); getMap().broadcastGMMessage(this, PacketCreator.cancelForeignBuff(id, dsstat), false); getMap().broadcastSpawnPlayerMapObjectMessage(this, this, false); - - for(MapleSummon ms: this.getSummonsValues()) { + + for (MapleSummon ms : this.getSummonsValues()) { getMap().broadcastNONGMMessage(this, PacketCreator.spawnSummon(ms, false), false); } - + for (MapleMapObject mo : this.getMap().getMonsters()) { MapleMonster m = (MapleMonster) mo; m.aggroUpdateController(); @@ -851,7 +849,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); } } - + public void Hide(boolean hide) { Hide(hide, false); } @@ -894,24 +892,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleDoor door = getPlayerDoor(); return door == null || (door.isActive() && door.getElapsedDeployTime() > 5000); } - + public void setHasSandboxItem() { hasSandboxItem = true; } - + public void removeSandboxItems() { // sandbox idea thanks to Morty if (!hasSandboxItem) { return; } - + MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - for(InventoryType invType : InventoryType.values()) { + for (InventoryType invType : InventoryType.values()) { Inventory inv = this.getInventory(invType); - + inv.lockInventory(); try { - for(Item item : new ArrayList<>(inv.list())) { - if(InventoryManipulator.isSandboxItem(item)) { + for (Item item : new ArrayList<>(inv.list())) { + if (InventoryManipulator.isSandboxItem(item)) { InventoryManipulator.removeFromSlot(client, invType, item.getPosition(), item.getQuantity(), false); dropMessage(5, "[" + ii.getName(item.getItemId()) + "] has passed its trial conditions and will be removed from your inventory."); } @@ -920,11 +918,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inv.unlockInventory(); } } - + hasSandboxItem = false; } - public FameStatus canGiveFame(MapleCharacter from) { + public FameStatus canGiveFame(Character from) { if (this.isGM()) { return FameStatus.OK; } else if (lastfametime >= System.currentTimeMillis() - 3600000 * 24) { @@ -1013,14 +1011,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (skilllevel > 0) { continue; } - + changeSkillLevel(skill, (byte) 0, 10, -1); } } } - + private void broadcastChangeJob() { - for (MapleCharacter chr : map.getAllPlayers()) { + for (Character chr : map.getAllPlayers()) { MapleClient chrC = chr.getClient(); if (chrC != null) { // propagate new job 3rd-person effects (FJ, Aran 1st strike, etc) @@ -1028,13 +1026,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.sendSpawnData(chrC); } } - + TimerManager.getInstance().schedule(new Runnable() { // need to delay to ensure clientside has finished reloading character data @Override public void run() { - MapleCharacter thisChr = MapleCharacter.this; + Character thisChr = Character.this; MapleMap map = thisChr.getMap(); - + if (map != null) { map.broadcastMessage(thisChr, PacketCreator.showForeignEffect(thisChr.getId(), 8), false); } @@ -1046,7 +1044,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newJob == null) { return;//the fuck you doing idiot! } - + if (canRecvPartySearchInvite && getParty() == null) { this.updatePartySearchAvailability(false); this.job = newJob; @@ -1054,7 +1052,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { this.job = newJob; } - + int spGain = 1; if (GameConstants.hasSPTable(newJob)) { spGain += 2; @@ -1062,16 +1060,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newJob.getId() % 10 == 2) { spGain += 2; } - + if (YamlConfig.config.server.USE_ENFORCE_JOB_SP_RANGE) { spGain = getChangedJobSp(newJob); } } - + if (spGain > 0) { gainSp(spGain, GameConstants.getSkillBook(newJob.getId()), true); } - + // thanks xinyifly for finding out missing AP awards (AP Reset can be used as a compass) if (newJob.getId() % 100 >= 1) { if (this.isCygnus()) { @@ -1086,13 +1084,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { gainAp(4, true); } } - + if (!isGM()) { for (byte i = 1; i < 5; i++) { gainSlots(i, 4, true); } } - + int addhp = 0, addmp = 0; int job_ = job.getId() % 1000; // lame temp "fix" if (job_ == 100) { // 1st warrior @@ -1124,7 +1122,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addmp += 275; } */ - + effLock.lock(); statWlock.lock(); try { @@ -1144,54 +1142,54 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.unlock(); effLock.unlock(); } - + setMPC(new MaplePartyCharacter(this)); silentPartyUpdate(); - + if (dragon != null) { getMap().broadcastMessage(PacketCreator.removeDragon(dragon.getObjectId())); dragon = null; } - + if (this.guildid > 0) { getGuild().broadcast(PacketCreator.jobMessage(0, job.getId(), name), this.getId()); } MapleFamily family = getFamily(); - if(family != null) { + if (family != null) { family.broadcast(PacketCreator.jobMessage(1, job.getId(), name), this.getId()); } setMasteries(this.job.getId()); guildUpdate(); - + broadcastChangeJob(); - + if (GameConstants.hasSPTable(newJob) && newJob.getId() != 2001) { if (getBuffedValue(BuffStat.MONSTER_RIDING) != null) { cancelBuffStats(BuffStat.MONSTER_RIDING); } createDragon(); } - + if (YamlConfig.config.server.USE_ANNOUNCE_CHANGEJOB) { if (!this.isGM()) { broadcastAcquaintances(6, "[" + GameConstants.ordinal(GameConstants.getJobBranch(newJob)) + " Job] " + name + " has just become a " + GameConstants.getJobName(this.job.getId()) + "."); // thanks Vcoc for noticing job name appearing in uppercase here } } } - + public void broadcastAcquaintances(int type, String message) { broadcastAcquaintances(PacketCreator.serverNotice(type, message)); } - + public void broadcastAcquaintances(Packet packet) { buddylist.broadcast(packet, getWorldServer().getPlayerStorage()); MapleFamily family = getFamily(); - if(family != null) { + if (family != null) { family.broadcast(packet, id); } - + MapleGuild guild = getGuild(); - if(guild != null) { + if (guild != null) { guild.broadcast(packet, id); } @@ -1210,16 +1208,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { keymap.remove(Integer.valueOf(key)); } } - + public void changeQuickslotKeybinding(byte[] aQuickslotKeyMapped) { this.m_pQuickslotKeyMapped = new QuickslotBinding(aQuickslotKeyMapped); } - + public void broadcastStance(int newStance) { setStance(newStance); broadcastStance(); } - + public void broadcastStance() { map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), AbstractAnimatedMapleMapObject.IDLE_MOVEMENT_PACKET_LENGTH), false); } @@ -1236,87 +1234,87 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return warpMap; } - + // for use ONLY inside OnUserEnter map scripts that requires a player to change map while still moving between maps. public void warpAhead(int map) { newWarpMap = map; } - + private void eventChangedMap(int map) { EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.changedMap(this, map); } } - + private void eventAfterChangedMap(int map) { EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.afterChangedMap(this, map); } } - + public boolean canRecoverLastBanish() { return System.currentTimeMillis() - this.banishTime < 5 * 60 * 1000; } - + public Pair getLastBanishData() { return new Pair<>(this.banishMap, this.banishSp); } - + public void clearBanishPlayerData() { this.banishMap = -1; this.banishSp = -1; this.banishTime = 0; } - + public void setBanishPlayerData(int banishMap, int banishSp, long banishTime) { this.banishMap = banishMap; this.banishSp = banishSp; this.banishTime = banishTime; } - + public void changeMapBanish(int mapid, String portal, String msg) { - if(YamlConfig.config.server.USE_SPIKES_AVOID_BANISH) { - for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { - if((it.getFlag() & ItemConstants.SPIKES) == ItemConstants.SPIKES) { + if (YamlConfig.config.server.USE_SPIKES_AVOID_BANISH) { + for (Item it : this.getInventory(InventoryType.EQUIPPED).list()) { + if ((it.getFlag() & ItemConstants.SPIKES) == ItemConstants.SPIKES) { return; } } } - + int banMap = this.getMapId(); int banSp = this.getMap().findClosestPlayerSpawnpoint(this.getPosition()).getId(); long banTime = System.currentTimeMillis(); - + if (msg != null) { dropMessage(5, msg); } - + MapleMap map_ = getWarpMap(mapid); MaplePortal portal_ = map_.getPortal(portal); changeMap(map_, portal_ != null ? portal_ : map_.getRandomPlayerSpawnpoint()); - + setBanishPlayerData(banMap, banSp, banTime); } public void changeMap(int map) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { warpMap = client.getChannelServer().getMapFactory().getMap(map); } - + changeMap(warpMap, warpMap.getRandomPlayerSpawnpoint()); } public void changeMap(int map, int portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1329,7 +1327,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(int map, String portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1342,7 +1340,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(int map, MaplePortal portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1359,10 +1357,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(MapleMap to, int portal) { changeMap(to, to.getPortal(portal)); } - + public void changeMap(final MapleMap target, MaplePortal pto) { canWarpCounter++; - + eventChangedMap(target.getId()); // player can be dropped from an event here, hence the new warping target. MapleMap to = getWarpMap(target.getId()); if (pto == null) { @@ -1370,218 +1368,214 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } public void changeMap(final MapleMap target, final Point pos) { canWarpCounter++; - + eventChangedMap(target.getId()); MapleMap to = getWarpMap(target.getId()); changeMapInternal(to, pos, PacketCreator.getWarpToMap(to, 0x80, pos, this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } - + public void forceChangeMap(final MapleMap target, MaplePortal pto) { // will actually enter the map given as parameter, regardless of being an eventmap or whatnot - + canWarpCounter++; eventChangedMap(999999999); - + EventInstanceManager mapEim = target.getEventInstance(); - if(mapEim != null) { + if (mapEim != null) { EventInstanceManager playerEim = this.getEventInstance(); - if(playerEim != null) { + if (playerEim != null) { playerEim.exitPlayer(this); - if(playerEim.getPlayerCount() == 0) { + if (playerEim.getPlayerCount() == 0) { playerEim.dispose(); } } - + // thanks Thora for finding an issue with players not being actually warped into the target event map (rather sent to the event starting map) mapEim.registerPlayer(this, false); } - + MapleMap to = target; // warps directly to the target intead of the target's map id, this allows GMs to patrol players inside instances. if (pto == null) { pto = to.getPortal(0); } changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } - + private boolean buffMapProtection() { int thisMapid = mapid; int returnMapid = client.getChannelServer().getMapFactory().getMap(thisMapid).getReturnMapId(); - + effLock.lock(); chrLock.lock(); try { - for(Entry mbs : effects.entrySet()) { - if(mbs.getKey() == BuffStat.MAP_PROTECTION) { - byte value = (byte)mbs.getValue().value; - - if(value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { + for (Entry mbs : effects.entrySet()) { + if (mbs.getKey() == BuffStat.MAP_PROTECTION) { + byte value = (byte) mbs.getValue().value; + + if (value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { return true; //protection from cold - } else if(value == 2 && (returnMapid == 230000000 || thisMapid == 200082300)) { - return true; //breathing underwater - } else { - return false; - } + } else return value == 2 && (returnMapid == 230000000 || thisMapid == 200082300); //breathing underwater } - } + } } finally { chrLock.unlock(); effLock.unlock(); } - - for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { - if((it.getFlag() & ItemConstants.COLD) == ItemConstants.COLD && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { + + for (Item it : this.getInventory(InventoryType.EQUIPPED).list()) { + if ((it.getFlag() & ItemConstants.COLD) == ItemConstants.COLD && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { return true; //protection from cold } } - + return false; } - + public List getLastVisitedMapids() { List lastVisited = new ArrayList<>(5); - + petLock.lock(); try { - for(WeakReference lv : lastVisitedMaps) { + for (WeakReference lv : lastVisitedMaps) { MapleMap lvm = lv.get(); - - if(lvm != null) { + + if (lvm != null) { lastVisited.add(lvm.getId()); } } } finally { petLock.unlock(); } - + return lastVisited; } - - public void partyOperationUpdate(MapleParty party, List exPartyMembers) { + + public void partyOperationUpdate(MapleParty party, List exPartyMembers) { List> mapids; - + petLock.lock(); try { mapids = new LinkedList<>(lastVisitedMaps); } finally { petLock.unlock(); } - - List partyMembers = new LinkedList<>(); - for(MapleCharacter mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) { - if(mc.isLoggedinWorld()) { + + List partyMembers = new LinkedList<>(); + for (Character mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) { + if (mc.isLoggedinWorld()) { partyMembers.add(mc); } } - - MapleCharacter partyLeaver = null; - if(exPartyMembers != null) { + + Character partyLeaver = null; + if (exPartyMembers != null) { partyMembers.remove(this); partyLeaver = this; } - + MapleMap map = this.getMap(); List partyItems = null; - + int partyId = exPartyMembers != null ? -1 : this.getPartyId(); - for(WeakReference mapRef : mapids) { + for (WeakReference mapRef : mapids) { MapleMap mapObj = mapRef.get(); - - if(mapObj != null) { + + if (mapObj != null) { List partyMapItems = mapObj.updatePlayerItemDropsToParty(partyId, id, partyMembers, partyLeaver); if (map.hashCode() == mapObj.hashCode()) { partyItems = partyMapItems; } } } - + if (partyItems != null && exPartyMembers == null) { map.updatePartyItemDropsToNewcomer(this, partyItems); } - + updatePartyTownDoors(party, this, partyLeaver, partyMembers); } - - private static void addPartyPlayerDoor(MapleCharacter target) { + + private static void addPartyPlayerDoor(Character target) { MapleDoor targetDoor = target.getPlayerDoor(); - if(targetDoor != null) { + if (targetDoor != null) { target.applyPartyDoor(targetDoor, true); } } - - private static void removePartyPlayerDoor(MapleParty party, MapleCharacter target) { + + private static void removePartyPlayerDoor(MapleParty party, Character target) { target.removePartyDoor(party); } - - private static void updatePartyTownDoors(MapleParty party, MapleCharacter target, MapleCharacter partyLeaver, List partyMembers) { - if(partyLeaver != null) { + + private static void updatePartyTownDoors(MapleParty party, Character target, Character partyLeaver, List partyMembers) { + if (partyLeaver != null) { removePartyPlayerDoor(party, target); } else { addPartyPlayerDoor(target); } - + Map partyDoors = null; - if(!partyMembers.isEmpty()) { + if (!partyMembers.isEmpty()) { partyDoors = party.getDoors(); - - for(MapleCharacter pchr : partyMembers) { + + for (Character pchr : partyMembers) { MapleDoor door = partyDoors.get(pchr.getId()); - if(door != null) { + if (door != null) { door.updateDoorPortal(pchr); } } - - for(MapleDoor door : partyDoors.values()) { - for(MapleCharacter pchar : partyMembers) { + + for (MapleDoor door : partyDoors.values()) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(pchar.getClient(), true); pchar.removeVisibleMapObject(mdo); } } - - if(partyLeaver != null) { + + if (partyLeaver != null) { Collection leaverDoors = partyLeaver.getDoors(); - for(MapleDoor door : leaverDoors) { - for(MapleCharacter pchar : partyMembers) { + for (MapleDoor door : leaverDoors) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(pchar.getClient(), true); pchar.removeVisibleMapObject(mdo); } } } - + List histMembers = party.getMembersSortedByHistory(); - for(Integer chrid : histMembers) { + for (Integer chrid : histMembers) { MapleDoor door = partyDoors.get(chrid); - if(door != null) { - for(MapleCharacter pchar : partyMembers) { + if (door != null) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendSpawnData(pchar.getClient()); pchar.addVisibleMapObject(mdo); @@ -1589,55 +1583,55 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(partyLeaver != null) { + + if (partyLeaver != null) { Collection leaverDoors = partyLeaver.getDoors(); - - if(partyDoors != null) { - for(MapleDoor door : partyDoors.values()) { + + if (partyDoors != null) { + for (MapleDoor door : partyDoors.values()) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(partyLeaver.getClient(), true); partyLeaver.removeVisibleMapObject(mdo); } } - - for(MapleDoor door : leaverDoors) { + + for (MapleDoor door : leaverDoors) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(partyLeaver.getClient(), true); partyLeaver.removeVisibleMapObject(mdo); } - - for(MapleDoor door : leaverDoors) { + + for (MapleDoor door : leaverDoors) { door.updateDoorPortal(partyLeaver); - + MapleDoorObject mdo = door.getTownDoor(); mdo.sendSpawnData(partyLeaver.getClient()); partyLeaver.addVisibleMapObject(mdo); } } } - + private Integer getVisitedMapIndex(MapleMap map) { int idx = 0; - - for(WeakReference mapRef : lastVisitedMaps) { - if(map.equals(mapRef.get())) { + + for (WeakReference mapRef : lastVisitedMaps) { + if (map.equals(mapRef.get())) { return idx; } - + idx++; } - + return -1; } - + public void visitMap(MapleMap map) { petLock.lock(); try { int idx = getVisitedMapIndex(map); - - if(idx == -1) { - if(lastVisitedMaps.size() == YamlConfig.config.server.MAP_VISITED_SIZE) { + + if (idx == -1) { + if (lastVisitedMaps.size() == YamlConfig.config.server.MAP_VISITED_SIZE) { lastVisitedMaps.remove(0); } } else { @@ -1651,24 +1645,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void setOwnedMap(MapleMap map) { ownedMap = new WeakReference<>(map); } - + public MapleMap getOwnedMap() { return ownedMap.get(); } public void notifyMapTransferToPartner(int mapid) { - if(partnerId > 0) { - final MapleCharacter partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId); - if(partner != null && !partner.isAwayFromWorld()) { + if (partnerId > 0) { + final Character partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId); + if (partner != null && !partner.isAwayFromWorld()) { partner.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(id, mapid)); } } } - + public void removeIncomingInvites() { MapleInviteCoordinator.removePlayerIncomingInvites(id); } @@ -1677,20 +1671,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!canWarpMap) { return; } - + this.mapTransitioning.set(true); - + this.unregisterChairBuff(); this.clearBanishPlayerData(); MapleTrade.cancelTrade(this, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); this.closePlayerInteractions(); - + MapleParty e = null; if (this.getParty() != null && this.getParty().getEnemy() != null) { e = this.getParty().getEnemy(); } final MapleParty k = e; - + sendPacket(warpPacket); map.removePlayer(this); if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) { @@ -1698,7 +1692,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { setPosition(pos); map.addPlayer(this); visitMap(map); - + prtLock.lock(); try { if (party != null) { @@ -1709,11 +1703,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - if (MapleCharacter.this.getParty() != null) { - MapleCharacter.this.getParty().setEnemy(k); + if (Character.this.getParty() != null) { + Character.this.getParty().setEnemy(k); } silentPartyUpdateInternal(getParty()); // EIM script calls inside - + if (getMap().getHPDec() > 0) { resetHpDecreaseTask(); } @@ -1722,20 +1716,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { client.disconnect(true, false); // thanks BHB for noticing a player storage stuck case here return; } - + notifyMapTransferToPartner(map.getId()); - + //alas, new map has been specified when a warping was being processed... - if(newWarpMap != -1) { + if (newWarpMap != -1) { canWarpMap = true; - + int temp = newWarpMap; newWarpMap = -1; changeMap(temp); } else { // if this event map has a gate already opened, render it EventInstanceManager eim = getEventInstance(); - if(eim != null) { + if (eim != null) { eim.recoverOpenedGate(this, map.getId()); } @@ -1743,11 +1737,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.environmentMoveList(map.getEnvironment().entrySet())); } } - + public boolean isChangingMaps() { return this.mapTransitioning.get(); } - + public void setMapTransitionComplete() { this.mapTransitioning.set(false); } @@ -1788,7 +1782,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (berserkSchedule != null) { berserkSchedule.cancel(false); } - final MapleCharacter chr = this; + final Character chr = this; if (job.equals(MapleJob.DARKKNIGHT)) { Skill BerserkX = SkillFactory.getSkill(DarkKnight.BERSERK); final int skilllevel = getSkillLevel(BerserkX); @@ -1800,12 +1794,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + sendPacket(PacketCreator.showOwnBerserk(skilllevel, berserk)); if (!isHidden) { - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } else { - getMap().broadcastGMMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastGMMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } } }, 5000, 3000); @@ -1830,7 +1824,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void stopControllingMonster(MapleMonster monster) { if (cpnLock.tryLock()) { try { @@ -1840,7 +1834,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public int getNumControlledMonsters() { cpnLock.lock(); try { @@ -1849,7 +1843,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cpnLock.unlock(); } } - + public Collection getControlledMonsters() { cpnLock.lock(); try { @@ -1858,10 +1852,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cpnLock.unlock(); } } - + public void releaseControlledMonsters() { Collection controlledMonsters; - + cpnLock.lock(); try { controlledMonsters = new ArrayList<>(controlled); @@ -1869,31 +1863,31 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { cpnLock.unlock(); } - + for (MapleMonster monster : controlledMonsters) { monster.aggroRedirectController(); } } - + public boolean applyConsumeOnPickup(final int itemid) { if (itemid / 1000000 == 2) { if (ii.isConsumeOnPickup(itemid)) { if (ItemConstants.isPartyItem(itemid)) { - List pchr = this.getPartyMembersOnSameMap(); - - if(!ItemConstants.isPartyAllcure(itemid)) { + List pchr = this.getPartyMembersOnSameMap(); + + if (!ItemConstants.isPartyAllcure(itemid)) { MapleStatEffect mse = ii.getItemEffect(itemid); - - if(!pchr.isEmpty()) { - for (MapleCharacter mc : pchr) { + + if (!pchr.isEmpty()) { + for (Character mc : pchr) { mse.applyTo(mc); } } else { mse.applyTo(this); } } else { - if(!pchr.isEmpty()) { - for (MapleCharacter mc : pchr) { + if (!pchr.isEmpty()) { + for (Character mc : pchr) { mc.dispelDebuffs(); } } else { @@ -1903,7 +1897,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { ii.getItemEffect(itemid).applyTo(this); } - + if (itemid / 10000 == 238) { this.getMonsterBook().addCard(client, itemid); } @@ -1912,28 +1906,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public final void pickupItem(MapleMapObject ob) { pickupItem(ob, -1); } - + public final void pickupItem(MapleMapObject ob, int petIndex) { // yes, one picks the MapleMapObject, not the MapleMapItem if (ob == null) { // pet index refers to the one picking up the item return; } - + if (ob instanceof MapleMapItem) { MapleMapItem mapitem = (MapleMapItem) ob; if (System.currentTimeMillis() - mapitem.getDropTime() < 400 || !mapitem.canBePickedBy(this)) { sendPacket(PacketCreator.enableActions()); return; } - - List mpcs = new LinkedList<>(); - if (mapitem.getMeso() > 0 && !mapitem.isPickedUp()) { + + List mpcs = new LinkedList<>(); + if (mapitem.getMeso() > 0 && !mapitem.isPickedUp()) { mpcs = getPartyMembersOnSameMap(); } - + ScriptedItem itemScript = null; mapitem.lockItem(); try { @@ -1942,7 +1936,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); return; } - + boolean isPet = petIndex > -1; final Packet pickupPacket = PacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex); @@ -1950,13 +1944,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { boolean hasSpaceInventory = true; if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = InventoryManipulator.checkSpace(client, mapitem.getItemId(), mItem.getQuantity(), mItem.getOwner()))) { int mapId = this.getMapId(); - + if ((mapId > 209000000 && mapId < 209000016) || (mapId >= 990000500 && mapId <= 990000502)) {//happyville trees and guild PQ if (!mapitem.isPlayerDrop() || mapitem.getDropper().getObjectId() == client.getPlayer().getObjectId()) { - if(mapitem.getMeso() > 0) { + if (mapitem.getMeso() > 0) { if (!mpcs.isEmpty()) { int mesosamm = mapitem.getMeso() / mpcs.size(); - for (MapleCharacter partymem : mpcs) { + for (Character partymem : mpcs) { if (partymem.isLoggedinWorld()) { partymem.gainMeso(mesosamm, true, true, false); } @@ -1964,9 +1958,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { this.gainMeso(mapitem.getMeso(), true, true, false); } - + this.getMap().pickItemDrop(pickupPacket, mapitem); - } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { + } else if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { // Add NX to account, show effect and make item disappear int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250; this.getCashShop().gainCash(1, nxGain); @@ -1988,17 +1982,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); return; } - + if (!this.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) { sendPacket(PacketCreator.showItemUnavailable()); sendPacket(PacketCreator.enableActions()); return; } - + if (mapitem.getMeso() > 0) { if (!mpcs.isEmpty()) { int mesosamm = mapitem.getMeso() / mpcs.size(); - for (MapleCharacter partymem : mpcs) { + for (Character partymem : mpcs) { if (partymem.isLoggedinWorld()) { partymem.gainMeso(mesosamm, true, true, false); } @@ -2016,11 +2010,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return; } } - } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { + } else if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { // Add NX to account, show effect and make item disappear int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250; this.getCashShop().gainCash(1, nxGain); - + showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300); } else if (applyConsumeOnPickup(mItem.getItemId())) { } else if (InventoryManipulator.addFromDrop(client, mItem, true)) { @@ -2033,14 +2027,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.getMap().pickItemDrop(pickupPacket, mapitem); - } else if(!hasSpaceInventory) { + } else if (!hasSpaceInventory) { sendPacket(PacketCreator.getInventoryFull()); sendPacket(PacketCreator.getShowInventoryFull()); } } finally { mapitem.unlockItem(); } - + if (itemScript != null) { ItemScriptManager ism = ItemScriptManager.getInstance(); ism.runItemScript(client, itemScript); @@ -2052,22 +2046,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int countItem(int itemid) { return inventory[ItemConstants.getInventoryType(itemid).ordinal()].countById(itemid); } - + public boolean canHold(int itemid) { return canHold(itemid, 1); } - + public boolean canHold(int itemid, int quantity) { return client.getAbstractPlayerInteraction().canHold(itemid, quantity); } - + public boolean canHoldUniques(List itemids) { for (Integer itemid : itemids) { if (ii.isPickupRestricted(itemid) && this.haveItem(itemid)) { return false; } } - + return true; } @@ -2075,18 +2069,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Integer bv = getBuffedValue(BuffStat.MONSTER_RIDING); return bv != null && bv.equals(Corsair.BATTLE_SHIP); } - + public void announceBattleshipHp() { sendPacket(PacketCreator.skillCooldown(5221999, battleshipHp)); } - + public void decreaseBattleshipHp(int decrease) { this.battleshipHp -= decrease; if (battleshipHp <= 0) { Skill battleship = SkillFactory.getSkill(Corsair.BATTLE_SHIP); int cooldown = battleship.getEffect(getSkillLevel(battleship)).getCooldown(); sendPacket(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown)); - addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000)); + addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), cooldown * 1000); removeCooldown(5221999); cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING); } else { @@ -2094,7 +2088,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addCooldown(5221999, 0, Long.MAX_VALUE); } } - + public void decreaseReports() { this.possibleReports--; } @@ -2113,24 +2107,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ex.printStackTrace(); } } - + private void nextPendingRequest(MapleClient c) { CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { c.sendPacket(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } } - + private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyList.BuddyOperation operation) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (remoteChannel != -1) { c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation); } } - + public void deleteBuddy(int otherCid) { BuddyList bl = getBuddylist(); - + if (bl.containsVisible(otherCid)) { notifyRemoteChannel(client, getWorldServer().find(otherCid), otherCid, BuddyList.BuddyOperation.DELETED); } @@ -2138,8 +2132,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.updateBuddylist(getBuddylist().getBuddies())); nextPendingRequest(client); } - - public static boolean deleteCharFromDB(MapleCharacter player, int senderAccId) { + + public static boolean deleteCharFromDB(Character player, int senderAccId) { int cid = player.getId(); if (!Server.getInstance().haveCharacterEntry(senderAccId, cid)) { // thanks zera (EpiphanyMS) for pointing a critical exploit with non-authed character deletion request return false; @@ -2164,7 +2158,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { int buddyid = rs.getInt("buddyid"); - MapleCharacter buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid); + Character buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid); if (buddy != null) { buddy.deleteBuddy(cid); @@ -2317,7 +2311,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { String[] toDel = {"famelog", "inventoryitems", "keymap", "queststatus", "savedlocations", "trocklocations", "skillmacros", "skills", "eventstats", "server_queue"}; for (String s : toDel) { - MapleCharacter.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid); + Character.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid); } Server.getInstance().deleteCharacterEntry(accId, cid); @@ -2327,7 +2321,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + private static void deleteQuestProgressWhereCharacterId(Connection con, int cid) throws SQLException { try (PreparedStatement ps = con.prepareStatement("DELETE FROM medalmaps WHERE characterid = ?")) { ps.setInt(1, cid); @@ -2338,7 +2332,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, cid); ps.executeUpdate(); } - + try (PreparedStatement ps = con.prepareStatement("DELETE FROM queststatus WHERE characterid = ?")) { ps.setInt(1, cid); ps.executeUpdate(); @@ -2370,20 +2364,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private static Pair> getChairTaskIntervalRate(int maxhp, int maxmp) { float toHeal = Math.max(maxhp, maxmp); float maxDuration = YamlConfig.config.server.CHAIR_EXTRA_HEAL_MAX_DELAY * 1000; - + int rate = 0; int minRegen = 1, maxRegen = (256 * YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER) - 1, midRegen = 1; while (minRegen < maxRegen) { midRegen = (int) ((minRegen + maxRegen) * 0.94); - + float procs = toHeal / midRegen; float newRate = maxDuration / procs; rate = (int) newRate; - + if (newRate < 420) { minRegen = (int) (1.2 * midRegen); } else if (newRate > 5000) { @@ -2392,7 +2386,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { break; } } - + float procs = maxDuration / rate; int hpRegen, mpRegen; if (maxhp > maxmp) { @@ -2402,10 +2396,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { hpRegen = (int) Math.ceil(maxhp / procs); mpRegen = midRegen; } - + return new Pair<>(rate, new Pair<>(hpRegen, mpRegen)); } - + private void updateChairHealStats() { statRlock.lock(); try { @@ -2415,7 +2409,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { statRlock.unlock(); } - + effLock.lock(); statWlock.lock(); try { @@ -2429,12 +2423,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private void startChairTask() { if (chair.get() < 0) { return; } - + int healInterval; effLock.lock(); try { @@ -2443,26 +2437,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { effLock.unlock(); } - + chrLock.lock(); try { if (chairRecoveryTask != null) { stopChairTask(); } - + chairRecoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { updateChairHealStats(); final int healHP = localchairhp; final int healMP = localchairmp; - - if(MapleCharacter.this.getHp() < localmaxhp) { + + if (Character.this.getHp() < localmaxhp) { byte recHP = (byte) (healHP / YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER); - + sendPacket(PacketCreator.showOwnRecovery(recHP)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, recHP), false); - } else if (MapleCharacter.this.getMp() >= localmaxmp) { + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, recHP), false); + } else if (Character.this.getMp() >= localmaxmp) { stopChairTask(); // optimizing schedule management when player is already with full pool. } @@ -2473,7 +2467,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void stopExtraTask() { chrLock.lock(); try { @@ -2485,7 +2479,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void startExtraTask(final byte healHP, final byte healMP, final short healInterval) { chrLock.lock(); try { @@ -2494,7 +2488,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void startExtraTaskInternal(final byte healHP, final byte healMP, final short healInterval) { extraRecInterval = healInterval; @@ -2505,11 +2499,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { stopExtraTask(); return; } - - if(MapleCharacter.this.getHp() < localmaxhp) { - if(healHP > 0) { + + if (Character.this.getHp() < localmaxhp) { + if (healHP > 0) { sendPacket(PacketCreator.showOwnRecovery(healHP)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, healHP), false); + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, healHP), false); } } @@ -2530,7 +2524,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void dispel() { - if(!(YamlConfig.config.server.USE_UNDISPEL_HOLY_SHIELD && this.hasActiveBuff(Bishop.HOLY_SHIELD))) { + if (!(YamlConfig.config.server.USE_UNDISPEL_HOLY_SHIELD && this.hasActiveBuff(Bishop.HOLY_SHIELD))) { List mbsvhList = getAllStatups(); for (MapleBuffStatValueHolder mbsvh : mbsvhList) { if (mbsvh.effect.isSkill()) { @@ -2550,7 +2544,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public final int getDiseasesSize() { chrLock.lock(); try { @@ -2565,28 +2559,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try { long curtime = Server.getInstance().getCurrentTime(); Map> ret = new LinkedHashMap<>(); - - for(Entry de : diseaseExpires.entrySet()) { + + for (Entry de : diseaseExpires.entrySet()) { Pair dee = diseases.get(de.getKey()); MapleDiseaseValueHolder mdvh = dee.getLeft(); - + ret.put(de.getKey(), new Pair<>(mdvh.length - (curtime - mdvh.startTime), dee.getRight())); } - + return ret; } finally { chrLock.unlock(); } } - + public void silentApplyDiseases(Map> diseaseMap) { chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - - for(Entry> di : diseaseMap.entrySet()) { + + for (Entry> di : diseaseMap.entrySet()) { long expTime = curTime + di.getValue().getLeft(); - + diseaseExpires.put(di.getKey(), expTime); diseases.put(di.getKey(), new Pair<>(new MapleDiseaseValueHolder(curTime, di.getValue().getLeft()), di.getValue().getRight())); } @@ -2594,23 +2588,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void announceDiseases() { Set>> chrDiseases; - + chrLock.lock(); try { // Poison damage visibility and diseases status visibility, extended through map transitions thanks to Ronan if (!this.isLoggedinWorld()) { return; } - + chrDiseases = new LinkedHashSet<>(diseases.entrySet()); } finally { chrLock.unlock(); } - - for(Entry> di : chrDiseases) { + + for (Entry> di : chrDiseases) { MapleDisease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); @@ -2622,11 +2616,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void collectDiseases() { - for (MapleCharacter chr : map.getAllPlayers()) { + for (Character chr : map.getAllPlayers()) { int cid = chr.getId(); - + for (Entry> di : chr.getAllDiseases().entrySet()) { MapleDisease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); @@ -2640,7 +2634,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void giveDebuff(final MapleDisease disease, MobSkill skill) { if (!hasDisease(disease) && getDiseasesSize() < 2) { if (!(disease == MapleDisease.SEDUCE || disease == MapleDisease.STUN)) { @@ -2648,7 +2642,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return; } } - + chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); @@ -2657,14 +2651,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + if (disease == MapleDisease.SEDUCE && chair.get() < 0) { sitChair(-1); } - + final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); sendPacket(PacketCreator.giveDebuff(debuff, skill)); - + if (disease != MapleDisease.SLOW) { map.broadcastMessage(this, PacketCreator.giveForeignDebuff(id, debuff, skill), false); } else { @@ -2677,7 +2671,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (hasDisease(debuff)) { long mask = debuff.getValue(); sendPacket(PacketCreator.cancelDebuff(mask)); - + if (debuff != MapleDisease.SLOW) { map.broadcastMessage(this, PacketCreator.cancelForeignDebuff(id, mask), false); } else { @@ -2702,14 +2696,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dispelDebuff(MapleDisease.WEAKEN); dispelDebuff(MapleDisease.SLOW); // thanks Conrad for noticing ZOMBIFY isn't dispellable } - + public void purgeDebuffs() { dispelDebuff(MapleDisease.SEDUCE); dispelDebuff(MapleDisease.ZOMBIFY); dispelDebuff(MapleDisease.CONFUSE); dispelDebuffs(); } - + public void cancelAllDebuffs() { chrLock.lock(); try { @@ -2719,7 +2713,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void dispelSkill(int skillid) { List allBuffs = getAllStatups(); for (MapleBuffStatValueHolder mbsvh : allBuffs) { @@ -2750,12 +2744,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public void changeFaceExpression(int emote) { long timeNow = Server.getInstance().getCurrentTime(); - if(timeNow - lastExpression > 2000) { + if (timeNow - lastExpression > 2000) { lastExpression = timeNow; - + FaceExpressionService service = (FaceExpressionService) client.getChannelServer().getServiceAccess(ChannelServices.FACE_EXPRESSION); service.registerFaceExpression(map, this, emote); } @@ -2767,7 +2761,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { lastHpDec = Server.getInstance().getCurrentTime(); } } - + private void startHpDecreaseTask(long lastHpTask) { hpDecreaseTask = TimerManager.getInstance().register(new Runnable() { @Override @@ -2776,16 +2770,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL, YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL - lastHpTask); } - + public void resetHpDecreaseTask() { if (hpDecreaseTask != null) { hpDecreaseTask.cancel(false); } - + long lastHpTask = Server.getInstance().getCurrentTime() - lastHpDec; startHpDecreaseTask((lastHpTask > YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL) ? YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL : lastHpTask); } - + public void dropMessage(String message) { dropMessage(0, message); } @@ -2793,7 +2787,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void dropMessage(int type, String message) { sendPacket(PacketCreator.serverNotice(type, message)); } - + public void enteredScript(String script, int mapid) { if (!entered.containsKey(mapid)) { entered.put(mapid, script); @@ -2808,7 +2802,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { getWorldServer().updateMessenger(getMessenger(), getName(), getWorld(), client.getChannel()); } } - + public void cancelDiseaseExpireTask() { if (diseaseExpireTask != null) { diseaseExpireTask.cancel(false); @@ -2822,28 +2816,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { Set toExpire = new LinkedHashSet<>(); - + chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - - for(Entry de : diseaseExpires.entrySet()) { - if(de.getValue() < curTime) { + + for (Entry de : diseaseExpires.entrySet()) { + if (de.getValue() < curTime) { toExpire.add(de.getKey()); } } } finally { chrLock.unlock(); } - - for(MapleDisease d : toExpire) { + + for (MapleDisease d : toExpire) { dispelDebuff(d); } } }, 1500); } } - + public void cancelBuffExpireTask() { if (buffExpireTask != null) { buffExpireTask.cancel(false); @@ -2858,15 +2852,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void run() { Set> es; List toCancel = new ArrayList<>(); - + effLock.lock(); chrLock.lock(); try { es = new LinkedHashSet<>(buffExpires.entrySet()); - + long curTime = Server.getInstance().getCurrentTime(); - for(Entry bel : es) { - if(curTime >= bel.getValue()) { + for (Entry bel : es) { + if (curTime >= bel.getValue()) { toCancel.add(buffEffects.get(bel.getKey()).entrySet().iterator().next().getValue()); //rofl } } @@ -2874,15 +2868,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - - for(MapleBuffStatValueHolder mbsvh : toCancel) { + + for (MapleBuffStatValueHolder mbsvh : toCancel) { cancelEffect(mbsvh.effect, false, mbsvh.startTime); } } }, 1500); } } - + public void cancelSkillCooldownTask() { if (skillCooldownTask != null) { skillCooldownTask.cancel(false); @@ -2896,7 +2890,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { Set> es; - + effLock.lock(); chrLock.lock(); try { @@ -2905,11 +2899,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + long curTime = Server.getInstance().getCurrentTime(); - for(Entry bel : es) { + for (Entry bel : es) { MapleCoolDownValueHolder mcdvh = bel.getValue(); - if(curTime >= mcdvh.startTime + mcdvh.length) { + if (curTime >= mcdvh.startTime + mcdvh.length) { removeCooldown(mcdvh.skillId); sendPacket(PacketCreator.skillCooldown(mcdvh.skillId, 0)); } @@ -2918,7 +2912,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }, 1500); } } - + public void cancelExpirationTask() { if (itemExpireTask != null) { itemExpireTask.cancel(false); @@ -2932,10 +2926,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { boolean deletedCoupon = false; - + long expiration, currenttime = System.currentTimeMillis(); Set keys = getSkills().keySet(); - for (Iterator i = keys.iterator(); i.hasNext();) { + for (Iterator i = keys.iterator(); i.hasNext(); ) { Skill key = i.next(); SkillEntry skill = getSkills().get(key); if (skill.expiration != -1 && skill.expiration < currenttime) { @@ -2947,7 +2941,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { for (Inventory inv : inventory) { for (Item item : inv.list()) { expiration = item.getExpiration(); - + if (expiration != -1 && (expiration < currenttime) && ((item.getFlag() & ItemConstants.LOCK) == ItemConstants.LOCK)) { short lock = item.getFlag(); lock &= ~(ItemConstants.LOCK); @@ -2966,7 +2960,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pet != null) { unequipPet(pet, true); } - + if (ItemConstants.isExpirablePet(item.getItemId())) { sendPacket(PacketCreator.itemExpired(item.getItemId())); toberemove.add(item); @@ -2977,8 +2971,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(!toberemove.isEmpty()) { + + if (!toberemove.isEmpty()) { for (Item item : toberemove) { InventoryManipulator.removeFromSlot(client, inv.getType(), item.getPosition(), item.getQuantity(), true); } @@ -3000,8 +2994,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { toberemove.clear(); } - - if(deletedCoupon) { + + if (deletedCoupon) { updateCouponRates(); } } @@ -3011,7 +3005,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public enum FameStatus { - + OK, NOT_TODAY, NOT_THIS_MONTH } @@ -3027,12 +3021,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { long currentgexp = gachaexp.get(); if ((currentgexp + exp.get()) >= ExpTable.getExpNeededForLevel(level)) { expgain += ExpTable.getExpNeededForLevel(level) - exp.get(); - + int nextneed = ExpTable.getExpNeededForLevel(level + 1); if (currentgexp - expgain >= nextneed) { expgain += nextneed; } - + this.gachaexp.set((int) (currentgexp - expgain)); } else { expgain = this.gachaexp.getAndSet(0); @@ -3044,7 +3038,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void addGachaExp(int gain) { updateSingleStat(MapleStat.GACHAEXP, gachaexp.addAndGet(gain)); } - + public void gainExp(int gain) { gainExp(gain, true, true); } @@ -3052,60 +3046,60 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void gainExp(int gain, boolean show, boolean inChat) { gainExp(gain, show, inChat, true); } - + public void gainExp(int gain, boolean show, boolean inChat, boolean white) { gainExp(gain, 0, show, inChat, white); } - + public void gainExp(int gain, int party, boolean show, boolean inChat, boolean white) { if (hasDisease(MapleDisease.CURSE)) { gain *= 0.5; party *= 0.5; } - - if(gain < 0) { + + if (gain < 0) { gain = Integer.MAX_VALUE; // integer overflow, heh. } - - if(party < 0) { + + if (party < 0) { party = Integer.MAX_VALUE; // integer overflow, heh. } - - int equip = (int) Math.min((long)(gain / 10) * pendantExp, Integer.MAX_VALUE); - - gainExpInternal((long) gain, equip, party, show, inChat, white); + + int equip = (int) Math.min((long) (gain / 10) * pendantExp, Integer.MAX_VALUE); + + gainExpInternal(gain, equip, party, show, inChat, white); } - + public void loseExp(int loss, boolean show, boolean inChat) { loseExp(loss, show, inChat, true); } - + public void loseExp(int loss, boolean show, boolean inChat, boolean white) { gainExpInternal(-loss, 0, 0, show, inChat, white); } - + private void announceExpGain(long gain, int equip, int party, boolean inChat, boolean white) { gain = Math.min(gain, Integer.MAX_VALUE); if (gain == 0) { if (party == 0) { return; } - + gain = party; party = 0; white = false; } - + sendPacket(PacketCreator.getShowExpGain((int) gain, equip, party, inChat, white)); } - + private synchronized void gainExpInternal(long gain, int equip, int party, boolean show, boolean inChat, boolean white) { // need of method synchonization here detected thanks to MedicOP long total = Math.max(gain + equip + party, -exp.get()); - + if (level < getMaxLevel() && (allowExpGain || this.getEventInstance() != null)) { long leftover = 0; long nextExp = exp.get() + total; - + if (nextExp > (long) Integer.MAX_VALUE) { total = Integer.MAX_VALUE - exp.get(); leftover = nextExp - Integer.MAX_VALUE; @@ -3122,8 +3116,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { break; } } - - if(leftover > 0) { + + if (leftover > 0) { gainExpInternal(leftover, equip, party, false, inChat, white); } else { lastExpGainTime = System.currentTimeMillis(); @@ -3147,36 +3141,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void gainFame(int delta) { gainFame(delta, null, 0); } - - public boolean gainFame(int delta, MapleCharacter fromPlayer, int mode) { + + public boolean gainFame(int delta, Character fromPlayer, int mode) { Pair fameRes = applyFame(delta); delta = fameRes.getRight(); if (delta != 0) { int thisFame = fameRes.getLeft(); updateSingleStat(MapleStat.FAME, thisFame); - + if (fromPlayer != null) { fromPlayer.sendPacket(PacketCreator.giveFameResponse(mode, getName(), thisFame)); sendPacket(PacketCreator.receiveFame(mode, fromPlayer.getName())); } else { sendPacket(PacketCreator.getShowFameGain(delta)); } - + return true; } else { return false; } } - + public boolean canHoldMeso(int gain) { // thanks lucasziron for pointing out a need to check space availability for mesos on player transactions long nextMeso = (long) meso.get() + gain; return nextMeso <= Integer.MAX_VALUE; } - + public void gainMeso(int gain) { gainMeso(gain, true, false, true); } @@ -3199,7 +3193,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { petLock.unlock(); } - + if (gain != 0) { updateSingleStat(MapleStat.MESO, (int) nextMeso, enableActions); if (show) { @@ -3220,7 +3214,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public List getAllCooldowns() { List ret = new ArrayList<>(); - + effLock.lock(); chrLock.lock(); try { @@ -3231,7 +3225,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + return ret; } @@ -3246,16 +3240,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public static int getAriantSlotsRoom(int room) { return ariantroomslot[room]; } - + public void updateAriantScore() { updateAriantScore(0); } - + public void updateAriantScore(int dropQty) { AriantColiseum arena = this.getAriantColiseum(); if (arena != null) { arena.updateAriantScore(this, countItem(4031868)); - + if (dropQty > 0) { arena.addLostShards(dropQty); } @@ -3364,14 +3358,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private List getAllStatups() { effLock.lock(); chrLock.lock(); try { List ret = new ArrayList<>(); - for(Map bel : buffEffects.values()) { - for(MapleBuffStatValueHolder mbsvh : bel.values()) { + for (Map bel : buffEffects.values()) { + for (MapleBuffStatValueHolder mbsvh : bel.values()) { ret.add(mbsvh); } } @@ -3381,19 +3375,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public List getAllBuffs() { // buff values will be stored in an arbitrary order effLock.lock(); chrLock.lock(); try { long curtime = Server.getInstance().getCurrentTime(); - + Map ret = new LinkedHashMap<>(); - for(Map bel : buffEffects.values()) { - for(MapleBuffStatValueHolder mbsvh : bel.values()) { + for (Map bel : buffEffects.values()) { + for (MapleBuffStatValueHolder mbsvh : bel.values()) { int srcid = mbsvh.effect.getBuffSourceId(); - if(!ret.containsKey(srcid)) { - ret.put(srcid, new PlayerBuffValueHolder((int)(curtime - mbsvh.startTime), mbsvh.effect)); + if (!ret.containsKey(srcid)) { + ret.put(srcid, new PlayerBuffValueHolder((int) (curtime - mbsvh.startTime), mbsvh.effect)); } } } @@ -3419,7 +3413,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean hasBuffFromSourceid(int sourceid) { effLock.lock(); chrLock.lock(); @@ -3430,10 +3424,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean hasActiveBuff(int sourceid) { LinkedList allBuffs; - + effLock.lock(); chrLock.lock(); try { @@ -3442,7 +3436,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + for (MapleBuffStatValueHolder mbsvh : allBuffs) { if (mbsvh.effect.getBuffSourceId() == sourceid) { return true; @@ -3450,35 +3444,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + private List> getActiveStatupsFromSourceid(int sourceid) { // already under effLock & chrLock List> ret = new ArrayList<>(); List> singletonStatups = new ArrayList<>(); - for(Entry bel : buffEffects.get(sourceid).entrySet()) { + for (Entry bel : buffEffects.get(sourceid).entrySet()) { BuffStat mbs = bel.getKey(); MapleBuffStatValueHolder mbsvh = effects.get(bel.getKey()); - + Pair p; - if(mbsvh != null) { + if (mbsvh != null) { p = new Pair<>(mbs, mbsvh.value); } else { p = new Pair<>(mbs, 0); } - + if (!isSingletonStatup(mbs)) { // thanks resinate, Daddy Egg for pointing out morph issues when updating it along with other statups ret.add(p); } else { singletonStatups.add(p); } } - + Collections.sort(ret, new Comparator>() { @Override public int compare(Pair p1, Pair p2) { return p1.getLeft().compareTo(p2.getLeft()); } }); - + if (!singletonStatups.isEmpty()) { Collections.sort(singletonStatups, new Comparator>() { @Override @@ -3486,88 +3480,88 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return p1.getLeft().compareTo(p2.getLeft()); } }); - + ret.addAll(singletonStatups); } - + return ret; } - + private void addItemEffectHolder(Integer sourceid, long expirationtime, Map statups) { buffEffects.put(sourceid, statups); buffExpires.put(sourceid, expirationtime); } - + private boolean removeEffectFromItemEffectHolder(Integer sourceid, BuffStat buffStat) { Map lbe = buffEffects.get(sourceid); - - if(lbe.remove(buffStat) != null) { - buffEffectsCount.put(buffStat, (byte)(buffEffectsCount.get(buffStat) - 1)); - - if(lbe.isEmpty()) { + + if (lbe.remove(buffStat) != null) { + buffEffectsCount.put(buffStat, (byte) (buffEffectsCount.get(buffStat) - 1)); + + if (lbe.isEmpty()) { buffEffects.remove(sourceid); buffExpires.remove(sourceid); } - + return true; } - + return false; } - + private void removeItemEffectHolder(Integer sourceid) { Map be = buffEffects.remove(sourceid); - if(be != null) { - for(Entry bei : be.entrySet()) { - buffEffectsCount.put(bei.getKey(), (byte)(buffEffectsCount.get(bei.getKey()) - 1)); + if (be != null) { + for (Entry bei : be.entrySet()) { + buffEffectsCount.put(bei.getKey(), (byte) (buffEffectsCount.get(bei.getKey()) - 1)); } } - + buffExpires.remove(sourceid); } - + private void dropWorstEffectFromItemEffectHolder(BuffStat mbs) { Integer min = Integer.MAX_VALUE; Integer srcid = -1; - for(Entry> bpl: buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvh = bpl.getValue().get(mbs); - if(mbsvh != null) { - if(mbsvh.value < min) { + if (mbsvh != null) { + if (mbsvh.value < min) { min = mbsvh.value; srcid = bpl.getKey(); } } } - + removeEffectFromItemEffectHolder(srcid, mbs); } - + private MapleBuffStatValueHolder fetchBestEffectFromItemEffectHolder(BuffStat mbs) { Pair max = new Pair<>(Integer.MIN_VALUE, 0); MapleBuffStatValueHolder mbsvh = null; - for(Entry> bpl: buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvhi = bpl.getValue().get(mbs); - if(mbsvhi != null) { - if(!mbsvhi.effect.isActive(this)) { + if (mbsvhi != null) { + if (!mbsvhi.effect.isActive(this)) { continue; } - - if(mbsvhi.value > max.left) { + + if (mbsvhi.value > max.left) { max = new Pair<>(mbsvhi.value, mbsvhi.effect.getStatups().size()); mbsvh = mbsvhi; - } else if(mbsvhi.value == max.left && mbsvhi.effect.getStatups().size() > max.right) { + } else if (mbsvhi.value == max.left && mbsvhi.effect.getStatups().size() > max.right) { max = new Pair<>(mbsvhi.value, mbsvhi.effect.getStatups().size()); mbsvh = mbsvhi; } } } - - if(mbsvh != null) { + + if (mbsvh != null) { effects.put(mbs, mbsvh); } return mbsvh; } - + private void extractBuffValue(int sourceid, BuffStat stat) { chrLock.lock(); try { @@ -3576,29 +3570,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void debugListAllBuffs() { effLock.lock(); chrLock.lock(); try { System.out.println("-------------------"); System.out.println("CACHED BUFF COUNT: "); - for(Entry bpl : buffEffectsCount.entrySet()) { + for (Entry bpl : buffEffectsCount.entrySet()) { System.out.println(bpl.getKey() + ": " + bpl.getValue()); } System.out.println("-------------------"); System.out.println("CACHED BUFFS: "); - for(Entry> bpl : buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { System.out.print(bpl.getKey() + ": "); - for(Entry pble : bpl.getValue().entrySet()) { + for (Entry pble : bpl.getValue().entrySet()) { System.out.print(pble.getKey().name() + pble.getValue().value + ", "); } System.out.println(); } System.out.println("-------------------"); - + System.out.println("IN ACTION:"); - for(Entry bpl : effects.entrySet()) { + for (Entry bpl : effects.entrySet()) { System.out.println(bpl.getKey().name() + " -> " + MapleItemInformationProvider.getInstance().getName(bpl.getValue().effect.getSourceId())); } } finally { @@ -3606,12 +3600,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void debugListAllBuffsCount() { effLock.lock(); chrLock.lock(); try { - for(Entry mbsl : buffEffectsCount.entrySet()) { + for (Entry mbsl : buffEffectsCount.entrySet()) { System.out.println(mbsl.getKey().name() + " -> " + mbsl.getValue()); } } finally { @@ -3619,7 +3613,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void cancelAllBuffs(boolean softcancel) { if (softcancel) { effLock.lock(); @@ -3628,10 +3622,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelEffectFromBuffStat(BuffStat.SUMMON); cancelEffectFromBuffStat(BuffStat.PUPPET); cancelEffectFromBuffStat(BuffStat.COMBO); - + effects.clear(); - - for(Integer srcid : new ArrayList<>(buffEffects.keySet())) { + + for (Integer srcid : new ArrayList<>(buffEffects.keySet())) { removeItemEffectHolder(srcid); } } finally { @@ -3644,8 +3638,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - for(Entry> bpl : buffEffects.entrySet()) { - for(Entry mbse : bpl.getValue().entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { + for (Entry mbse : bpl.getValue().entrySet()) { mseBuffs.put(mbse.getValue().effect, mbse.getValue().startTime); } } @@ -3663,15 +3657,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void dropBuffStats(List> effectsToCancel) { for (Pair cancelEffectCancelTasks : effectsToCancel) { //boolean nestedCancel = false; - + chrLock.lock(); try { /* if (buffExpires.get(cancelEffectCancelTasks.getRight().effect.getBuffSourceId()) != null) { nestedCancel = true; }*/ - - if(cancelEffectCancelTasks.getRight().bestApplied) { + + if (cancelEffectCancelTasks.getRight().bestApplied) { fetchBestEffectFromItemEffectHolder(cancelEffectCancelTasks.getLeft()); } } finally { @@ -3684,26 +3678,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }*/ } } - + private List> deregisterBuffStats(Map stats) { chrLock.lock(); try { List> effectsToCancel = new ArrayList<>(stats.size()); for (Entry stat : stats.entrySet()) { int sourceid = stat.getValue().effect.getBuffSourceId(); - - if(!buffEffects.containsKey(sourceid)) { + + if (!buffEffects.containsKey(sourceid)) { buffExpires.remove(sourceid); } - + BuffStat mbs = stat.getKey(); effectsToCancel.add(new Pair<>(mbs, stat.getValue())); - + MapleBuffStatValueHolder mbsvh = effects.get(mbs); if (mbsvh != null && mbsvh.effect.getBuffSourceId() == sourceid) { mbsvh.bestApplied = true; effects.remove(mbs); - + if (mbs == BuffStat.RECOVERY) { if (recoveryTask != null) { recoveryTask.cancel(false); @@ -3717,7 +3711,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { getMap().broadcastMessage(PacketCreator.removeSummon(summon, true), summon.getPosition()); getMap().removeMapObject(summon); removeVisibleMapObject(summon); - + summons.remove(summonId); if (summon.isPuppet()) { map.removePlayerPuppet(this); @@ -3736,18 +3730,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dragonBloodSchedule.cancel(false); dragonBloodSchedule = null; } else if (mbs == BuffStat.HPREC || mbs == BuffStat.MPREC) { - if(mbs == BuffStat.HPREC) { + if (mbs == BuffStat.HPREC) { extraHpRec = 0; } else { extraMpRec = 0; } - + if (extraRecoveryTask != null) { extraRecoveryTask.cancel(false); extraRecoveryTask = null; } - - if(extraHpRec != 0 || extraMpRec != 0) { + + if (extraHpRec != 0 || extraMpRec != 0) { startExtraTaskInternal(extraHpRec, extraMpRec, extraRecInterval); } } @@ -3759,14 +3753,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void cancelEffect(int itemId) { cancelEffect(ii.getItemEffect(itemId), false, -1); } public boolean cancelEffect(MapleStatEffect effect, boolean overwrite, long startTime) { boolean ret; - + prtLock.lock(); effLock.lock(); try { @@ -3775,7 +3769,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); prtLock.unlock(); } - + if (effect.isMagicDoor() && ret) { prtLock.lock(); effLock.lock(); @@ -3788,10 +3782,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + return ret; } - + private static MapleStatEffect getEffectFromBuffSource(Map buffSource) { try { return buffSource.entrySet().iterator().next().getValue().effect; @@ -3799,10 +3793,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } } - + private boolean isUpdatingEffect(Set activeEffects, MapleStatEffect mse) { - if (mse == null) return false; - + if (mse == null) { + return false; + } + // thanks xinyifly for noticing "Speed Infusion" crashing game when updating buffs during map transition boolean active = mse.isActive(this); if (active) { @@ -3811,17 +3807,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return activeEffects.contains(mse); } } - + public void updateActiveEffects() { effLock.lock(); // thanks davidlafriniere, maple006, RedHat for pointing a deadlock occurring here try { Set updatedBuffs = new LinkedHashSet<>(); Set activeEffects = new LinkedHashSet<>(); - + for (MapleBuffStatValueHolder mse : effects.values()) { activeEffects.add(mse.effect); } - + for (Map buff : buffEffects.values()) { MapleStatEffect mse = getEffectFromBuffSource(buff); if (isUpdatingEffect(activeEffects, mse)) { @@ -3830,26 +3826,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + for (BuffStat mbs : updatedBuffs) { effects.remove(mbs); } - + updateEffects(updatedBuffs); } finally { effLock.unlock(); } } - + private void updateEffects(Set removedStats) { effLock.lock(); chrLock.lock(); try { Set retrievedStats = new LinkedHashSet<>(); - + for (BuffStat mbs : removedStats) { fetchBestEffectFromItemEffectHolder(mbs); - + MapleBuffStatValueHolder mbsvh = effects.get(mbs); if (mbsvh != null) { for (Pair statup : mbsvh.effect.getStatups()) { @@ -3857,23 +3853,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + propagateBuffEffectUpdates(new LinkedHashMap>(), retrievedStats, removedStats); } finally { chrLock.unlock(); effLock.unlock(); } } - + private boolean cancelEffect(MapleStatEffect effect, boolean overwrite, long startTime, boolean firstCancel) { Set removedStats = new LinkedHashSet<>(); dropBuffStats(cancelEffectInternal(effect, overwrite, startTime, removedStats)); updateLocalStats(); updateEffects(removedStats); - + return !removedStats.isEmpty(); } - + private List> cancelEffectInternal(MapleStatEffect effect, boolean overwrite, long startTime, Set removedStats) { Map buffstats = null; BuffStat ombs; @@ -3881,35 +3877,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffstats = extractCurrentBuffStats(effect); } else if ((ombs = getSingletonStatupFromEffect(effect)) != null) { // removing all effects of a buff having non-shareable buff stat. MapleBuffStatValueHolder mbsvh = effects.get(ombs); - if(mbsvh != null) { + if (mbsvh != null) { buffstats = extractCurrentBuffStats(mbsvh.effect); } } - + if (buffstats == null) { // all else, is dropping ALL current statups that uses same stats as the given effect buffstats = extractLeastRelevantStatEffectsIfFull(effect); } - + if (effect.isMapChair()) { stopChairTask(); } - + List> toCancel = deregisterBuffStats(buffstats); if (effect.isMonsterRiding()) { this.getClient().getWorldServer().unregisterMountHunger(this); this.getMount().setActive(false); } - + if (!overwrite) { removedStats.addAll(buffstats.keySet()); } - + return toCancel; } public void cancelEffectFromBuffStat(BuffStat stat) { MapleBuffStatValueHolder effect; - + effLock.lock(); chrLock.lock(); try { @@ -3922,17 +3918,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelEffect(effect.effect, false, -1); } } - + public void cancelBuffStats(BuffStat stat) { effLock.lock(); try { List> cancelList = new LinkedList<>(); - + chrLock.lock(); try { - for(Entry> bel : this.buffEffects.entrySet()) { + for (Entry> bel : this.buffEffects.entrySet()) { MapleBuffStatValueHolder beli = bel.getValue().get(stat); - if(beli != null) { + if (beli != null) { cancelList.add(new Pair<>(bel.getKey(), beli)); } } @@ -3941,7 +3937,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } Map buffStatList = new LinkedHashMap<>(); - for(Pair p : cancelList) { + for (Pair p : cancelList) { buffStatList.put(stat, p.getRight()); extractBuffValue(p.getLeft(), stat); dropBuffStats(deregisterBuffStats(buffStatList)); @@ -3949,45 +3945,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { effLock.unlock(); } - + cancelPlayerBuffs(Arrays.asList(stat)); } - + private Map extractCurrentBuffStats(MapleStatEffect effect) { chrLock.lock(); try { Map stats = new LinkedHashMap<>(); Map buffList = buffEffects.remove(effect.getBuffSourceId()); - - if(buffList != null) { + + if (buffList != null) { for (Entry stateffect : buffList.entrySet()) { stats.put(stateffect.getKey(), stateffect.getValue()); - buffEffectsCount.put(stateffect.getKey(), (byte)(buffEffectsCount.get(stateffect.getKey()) - 1)); + buffEffectsCount.put(stateffect.getKey(), (byte) (buffEffectsCount.get(stateffect.getKey()) - 1)); } } - + return stats; } finally { chrLock.unlock(); } } - + private Map extractLeastRelevantStatEffectsIfFull(MapleStatEffect effect) { Map extractedStatBuffs = new LinkedHashMap<>(); - + chrLock.lock(); try { Map stats = new LinkedHashMap<>(); Map minStatBuffs = new LinkedHashMap<>(); - - for(Entry> mbsvhi : buffEffects.entrySet()) { - for(Entry mbsvhe : mbsvhi.getValue().entrySet()) { + + for (Entry> mbsvhi : buffEffects.entrySet()) { + for (Entry mbsvhe : mbsvhi.getValue().entrySet()) { BuffStat mbs = mbsvhe.getKey(); Byte b = stats.get(mbs); - - if(b != null) { + + if (b != null) { stats.put(mbs, (byte) (b + 1)); - if(mbsvhe.getValue().value < minStatBuffs.get(mbs).value) { + if (mbsvhe.getValue().value < minStatBuffs.get(mbs).value) { minStatBuffs.put(mbs, mbsvhe.getValue()); } } else { @@ -3996,23 +3992,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + Set effectStatups = new LinkedHashSet<>(); - for(Pair efstat : effect.getStatups()) { + for (Pair efstat : effect.getStatups()) { effectStatups.add(efstat.getLeft()); } - - for(Entry it : stats.entrySet()) { + + for (Entry it : stats.entrySet()) { boolean uniqueBuff = isSingletonStatup(it.getKey()); - - if(it.getValue() >= (!uniqueBuff ? YamlConfig.config.server.MAX_MONITORED_BUFFSTATS : 1) && effectStatups.contains(it.getKey())) { + + if (it.getValue() >= (!uniqueBuff ? YamlConfig.config.server.MAX_MONITORED_BUFFSTATS : 1) && effectStatups.contains(it.getKey())) { MapleBuffStatValueHolder mbsvh = minStatBuffs.get(it.getKey()); - + Map lpbe = buffEffects.get(mbsvh.effect.getBuffSourceId()); lpbe.remove(it.getKey()); - buffEffectsCount.put(it.getKey(), (byte)(buffEffectsCount.get(it.getKey()) - 1)); - - if(lpbe.isEmpty()) { + buffEffectsCount.put(it.getKey(), (byte) (buffEffectsCount.get(it.getKey()) - 1)); + + if (lpbe.isEmpty()) { buffEffects.remove(mbsvh.effect.getBuffSourceId()); } extractedStatBuffs.put(it.getKey(), mbsvh); @@ -4021,10 +4017,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + return extractedStatBuffs; } - + private void cancelInactiveBuffStats(Set retrievedStats, Set removedStats) { List inactiveStats = new LinkedList<>(); for (BuffStat mbs : removedStats) { @@ -4032,22 +4028,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inactiveStats.add(mbs); } } - + if (!inactiveStats.isEmpty()) { sendPacket(PacketCreator.cancelBuff(inactiveStats)); getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), inactiveStats), false); } } - + private static Map topologicalSortLeafStatCount(Map> buffStack) { Map leafBuffCount = new LinkedHashMap<>(); - + for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); if (mseStack.isEmpty()) { continue; } - + MapleStatEffect mse = mseStack.peek(); Integer count = leafBuffCount.get(mse); if (count == null) { @@ -4056,74 +4052,76 @@ public class MapleCharacter extends AbstractMapleCharacterObject { leafBuffCount.put(mse, count + 1); } } - + return leafBuffCount; } - + private static List topologicalSortRemoveLeafStats(Map> stackedBuffStats, Map> buffStack, Map leafStatCount) { List clearedStatEffects = new LinkedList<>(); Set clearedStats = new LinkedHashSet<>(); - + for (Entry e : leafStatCount.entrySet()) { MapleStatEffect mse = e.getKey(); - + if (stackedBuffStats.get(mse).size() <= e.getValue()) { clearedStatEffects.add(mse); - + for (BuffStat mbs : stackedBuffStats.get(mse)) { clearedStats.add(mbs); } } } - + for (BuffStat mbs : clearedStats) { MapleStatEffect mse = buffStack.get(mbs).pop(); stackedBuffStats.get(mse).remove(mbs); } - + return clearedStatEffects; } - + private static void topologicalSortRebaseLeafStats(Map> stackedBuffStats, Map> buffStack) { for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); - + if (!mseStack.isEmpty()) { MapleStatEffect mse = mseStack.pop(); stackedBuffStats.get(mse).remove(e.getKey()); } } } - + private static List topologicalSortEffects(Map>> buffEffects) { Map> stackedBuffStats = new LinkedHashMap<>(); Map> buffStack = new LinkedHashMap<>(); - + for (Entry>> e : buffEffects.entrySet()) { BuffStat mbs = e.getKey(); - + Stack mbsStack = new Stack<>(); buffStack.put(mbs, mbsStack); - + for (Pair emse : e.getValue()) { MapleStatEffect mse = emse.getLeft(); mbsStack.push(mse); - + Set mbsStats = stackedBuffStats.get(mse); if (mbsStats == null) { mbsStats = new LinkedHashSet<>(); stackedBuffStats.put(mse, mbsStats); } - + mbsStats.add(mbs); } } - + List buffList = new LinkedList<>(); while (true) { Map leafStatCount = topologicalSortLeafStatCount(buffStack); - if (leafStatCount.isEmpty()) break; - + if (leafStatCount.isEmpty()) { + break; + } + List clearedNodes = topologicalSortRemoveLeafStats(stackedBuffStats, buffStack, leafStatCount); if (clearedNodes.isEmpty()) { topologicalSortRebaseLeafStats(stackedBuffStats, buffStack); @@ -4131,54 +4129,53 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffList.addAll(clearedNodes); } } - + return buffList; } - + private static List sortEffectsList(Map updateEffectsList) { Map>> buffEffects = new LinkedHashMap<>(); - + for (Entry p : updateEffectsList.entrySet()) { MapleStatEffect mse = p.getKey(); - + for (Pair statup : mse.getStatups()) { BuffStat stat = statup.getLeft(); - + List> statBuffs = buffEffects.get(stat); if (statBuffs == null) { statBuffs = new ArrayList<>(); buffEffects.put(stat, statBuffs); } - + statBuffs.add(new Pair<>(mse, statup.getRight())); } } - + Comparator cmp = new Comparator>() { @Override - public int compare(Pair o1, Pair o2) - { + public int compare(Pair o1, Pair o2) { return o2.getRight().compareTo(o1.getRight()); } }; - + for (Entry>> statBuffs : buffEffects.entrySet()) { Collections.sort(statBuffs.getValue(), cmp); } - + return topologicalSortEffects(buffEffects); } - + private List>> propagatePriorityBuffEffectUpdates(Set retrievedStats) { List>> priorityUpdateEffects = new LinkedList<>(); Map yokeStats = new LinkedHashMap<>(); - + // priority buffsources: override buffstats for the client to perceive those as "currently buffed" Set mbsvhList = new LinkedHashSet<>(); for (MapleBuffStatValueHolder mbsvh : getAllStatups()) { mbsvhList.add(mbsvh); } - + for (MapleBuffStatValueHolder mbsvh : mbsvhList) { MapleStatEffect mse = mbsvh.effect; int buffSourceId = mse.getBuffSourceId(); @@ -4187,126 +4184,126 @@ public class MapleCharacter extends AbstractMapleCharacterObject { BuffStat mbs = ps.getLeft(); if (retrievedStats.contains(mbs)) { MapleBuffStatValueHolder mbsvhe = effects.get(mbs); - + // this shouldn't even be null... //if (mbsvh != null) { - yokeStats.put(mbsvh, mbsvhe.effect); + yokeStats.put(mbsvh, mbsvhe.effect); //} } } } } - + for (Entry e : yokeStats.entrySet()) { MapleBuffStatValueHolder mbsvhPriority = e.getKey(); MapleStatEffect mseActive = e.getValue(); - + priorityUpdateEffects.add(new Pair<>(mseActive.getBuffSourceId(), new Pair<>(mbsvhPriority.effect, mbsvhPriority.startTime))); } - + return priorityUpdateEffects; } - + private void propagateBuffEffectUpdates(Map> retrievedEffects, Set retrievedStats, Set removedStats) { cancelInactiveBuffStats(retrievedStats, removedStats); if (retrievedStats.isEmpty()) { return; } - + Map> maxBuffValue = new LinkedHashMap<>(); - for(BuffStat mbs : retrievedStats) { + for (BuffStat mbs : retrievedStats) { MapleBuffStatValueHolder mbsvh = effects.get(mbs); - if(mbsvh != null) { + if (mbsvh != null) { retrievedEffects.put(mbsvh.effect.getBuffSourceId(), new Pair<>(mbsvh.effect, mbsvh.startTime)); } - - maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, (MapleStatEffect) null)); + + maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, null)); } - + Map updateEffects = new LinkedHashMap<>(); - + List recalcMseList = new LinkedList<>(); - for(Entry> re : retrievedEffects.entrySet()) { + for (Entry> re : retrievedEffects.entrySet()) { recalcMseList.add(re.getValue().getLeft()); } - + boolean mageJob = this.getJobStyle() == MapleJob.MAGICIAN; do { List mseList = recalcMseList; recalcMseList = new LinkedList<>(); - - for(MapleStatEffect mse : mseList) { + + for (MapleStatEffect mse : mseList) { int maxEffectiveStatup = Integer.MIN_VALUE; - for(Pair st : mse.getStatups()) { + for (Pair st : mse.getStatups()) { BuffStat mbs = st.getLeft(); - + boolean relevantStatup = true; - if(mbs == BuffStat.WATK) { // not relevant for mages - if(mageJob) { + if (mbs == BuffStat.WATK) { // not relevant for mages + if (mageJob) { relevantStatup = false; } - } else if(mbs == BuffStat.MATK) { // not relevant for non-mages - if(!mageJob) { + } else if (mbs == BuffStat.MATK) { // not relevant for non-mages + if (!mageJob) { relevantStatup = false; } } - + Pair mbv = maxBuffValue.get(mbs); - if(mbv == null) { + if (mbv == null) { continue; } - - if(mbv.getLeft() < st.getRight()) { + + if (mbv.getLeft() < st.getRight()) { MapleStatEffect msbe = mbv.getRight(); - if(msbe != null) { + if (msbe != null) { recalcMseList.add(msbe); } - + maxBuffValue.put(mbs, new Pair<>(st.getRight(), mse)); - - if(relevantStatup) { - if(maxEffectiveStatup < st.getRight()) { + + if (relevantStatup) { + if (maxEffectiveStatup < st.getRight()) { maxEffectiveStatup = st.getRight(); } } } } - + updateEffects.put(mse, maxEffectiveStatup); } - } while(!recalcMseList.isEmpty()); - + } while (!recalcMseList.isEmpty()); + List updateEffectsList = sortEffectsList(updateEffects); - + List>> toUpdateEffects = new LinkedList<>(); - for(MapleStatEffect mse : updateEffectsList) { + for (MapleStatEffect mse : updateEffectsList) { toUpdateEffects.add(new Pair<>(mse.getBuffSourceId(), retrievedEffects.get(mse.getBuffSourceId()))); } - + List> activeStatups = new LinkedList<>(); - for(Pair> lmse: toUpdateEffects) { + for (Pair> lmse : toUpdateEffects) { Pair msel = lmse.getRight(); - - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + + for (Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } - + msel.getLeft().updateBuffEffect(this, activeStatups, msel.getRight()); activeStatups.clear(); } - + List>> priorityEffects = propagatePriorityBuffEffectUpdates(retrievedStats); - for(Pair> lmse: priorityEffects) { + for (Pair> lmse : priorityEffects) { Pair msel = lmse.getRight(); - - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + + for (Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } - + msel.getLeft().updateBuffEffect(this, activeStatups, msel.getRight()); activeStatups.clear(); } - + if (this.isRidingBattleship()) { List> statups = new ArrayList<>(1); statups.add(new Pair<>(BuffStat.MONSTER_RIDING, 0)); @@ -4314,19 +4311,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.announceBattleshipHp(); } } - + private static BuffStat getSingletonStatupFromEffect(MapleStatEffect mse) { - for(Pair mbs : mse.getStatups()) { - if(isSingletonStatup(mbs.getLeft())) { + for (Pair mbs : mse.getStatups()) { + if (isSingletonStatup(mbs.getLeft())) { return mbs.getLeft(); } } - + return null; } - + private static boolean isSingletonStatup(BuffStat mbs) { - switch(mbs) { //HPREC and MPREC are supposed to be singleton + switch (mbs) { //HPREC and MPREC are supposed to be singleton case COUPON_EXP1: case COUPON_EXP2: case COUPON_EXP3: @@ -4349,24 +4346,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { case SPEED: case JUMP: return false; - + default: return true; } } - + private static boolean isPriorityBuffSourceid(int sourceid) { - switch(sourceid) { + switch (sourceid) { case -2022631: case -2022632: case -2022633: return true; - + default: return false; } } - + private void addItemEffectHolderCount(BuffStat stat) { Byte val = buffEffectsCount.get(stat); if (val != null) { @@ -4377,7 +4374,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffEffectsCount.put(stat, val); } - + public void registerEffect(MapleStatEffect effect, long starttime, long expirationtime, boolean isSilent) { if (effect.isDragonBlood()) { prepareDragonBlood(effect); @@ -4402,11 +4399,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + addHP(healEffect.getHp()); sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, 5), true); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showOwnBuffEffect(beholder, 2), false); + getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, 5), true); + getMap().broadcastMessage(Character.this, PacketCreator.showOwnBuffEffect(beholder, 2), false); } }, healInterval, healInterval); } @@ -4420,24 +4417,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - - buffEffect.applyTo(MapleCharacter.this); + + buffEffect.applyTo(Character.this); sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false); + getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); + getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false); } }, buffInterval, buffInterval); } } else if (effect.isRecovery()) { int healInterval = (YamlConfig.config.server.USE_ULTRA_RECOVERY) ? 2000 : 5000; final byte heal = (byte) effect.getX(); - + chrLock.lock(); try { - if(recoveryTask != null) { + if (recoveryTask != null) { recoveryTask.cancel(false); } - + recoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -4457,23 +4454,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addHP(heal); sendPacket(PacketCreator.showOwnRecovery(heal)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, heal), false); + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, heal), false); } }, healInterval, healInterval); } finally { chrLock.unlock(); } } else if (effect.getHpRRate() > 0 || effect.getMpRRate() > 0) { - if(effect.getHpRRate() > 0) { + if (effect.getHpRRate() > 0) { extraHpRec = effect.getHpR(); extraRecInterval = effect.getHpRRate(); } - - if(effect.getMpRRate() > 0) { + + if (effect.getMpRRate() > 0) { extraMpRec = effect.getMpR(); extraRecInterval = effect.getMpRRate(); } - + chrLock.lock(); try { stopExtraTask(); @@ -4481,11 +4478,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + } else if (effect.isMapChair()) { startChairTask(); } - + prtLock.lock(); effLock.lock(); chrLock.lock(); @@ -4493,35 +4490,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Integer sourceid = effect.getBuffSourceId(); Map toDeploy; Map appliedStatups = new LinkedHashMap<>(); - - for(Pair ps : effect.getStatups()) { + + for (Pair ps : effect.getStatups()) { appliedStatups.put(ps.getLeft(), new MapleBuffStatValueHolder(effect, starttime, ps.getRight())); } - + boolean active = effect.isActive(this); - if(YamlConfig.config.server.USE_BUFF_MOST_SIGNIFICANT) { + if (YamlConfig.config.server.USE_BUFF_MOST_SIGNIFICANT) { toDeploy = new LinkedHashMap<>(); Map> retrievedEffects = new LinkedHashMap<>(); Set retrievedStats = new LinkedHashSet<>(); for (Entry statup : appliedStatups.entrySet()) { MapleBuffStatValueHolder mbsvh = effects.get(statup.getKey()); MapleBuffStatValueHolder statMbsvh = statup.getValue(); - - if(active) { - if(mbsvh == null || mbsvh.value < statMbsvh.value || (mbsvh.value == statMbsvh.value && mbsvh.effect.getStatups().size() <= statMbsvh.effect.getStatups().size())) { + + if (active) { + if (mbsvh == null || mbsvh.value < statMbsvh.value || (mbsvh.value == statMbsvh.value && mbsvh.effect.getStatups().size() <= statMbsvh.effect.getStatups().size())) { toDeploy.put(statup.getKey(), statMbsvh); } else { - if(!isSingletonStatup(statup.getKey())) { - for(Pair mbs : mbsvh.effect.getStatups()) { + if (!isSingletonStatup(statup.getKey())) { + for (Pair mbs : mbsvh.effect.getStatups()) { retrievedStats.add(mbs.getLeft()); } } } } - + addItemEffectHolderCount(statup.getKey()); } - + // should also propagate update from buffs shared with priority sourceids Set updated = appliedStatups.keySet(); for (MapleBuffStatValueHolder mbsvh : this.getAllStatups()) { @@ -4533,27 +4530,27 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(!isSilent) { + + if (!isSilent) { addItemEffectHolder(sourceid, expirationtime, appliedStatups); for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); } - + if (active) { retrievedEffects.put(sourceid, new Pair<>(effect, starttime)); } - + propagateBuffEffectUpdates(retrievedEffects, retrievedStats, new LinkedHashSet()); } } else { for (Entry statup : appliedStatups.entrySet()) { addItemEffectHolderCount(statup.getKey()); } - + toDeploy = (active ? appliedStatups : new LinkedHashMap()); } - + addItemEffectHolder(sourceid, expirationtime, appliedStatups); for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); @@ -4563,12 +4560,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); prtLock.unlock(); } - + updateLocalStats(); } - + private static int getJobMapChair(MapleJob job) { - switch(job.getId() / 1000) { + switch (job.getId() / 1000) { case 0: return Beginner.MAP_CHAIR; case 1: @@ -4577,60 +4574,60 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return Legend.MAP_CHAIR; } } - + public boolean unregisterChairBuff() { if (!YamlConfig.config.server.USE_CHAIR_EXTRAHEAL) { return false; } - + int skillId = getJobMapChair(job); int skillLv = getSkillLevel(skillId); - if(skillLv > 0) { + if (skillLv > 0) { MapleStatEffect mapChairSkill = SkillFactory.getSkill(skillId).getEffect(skillLv); return cancelEffect(mapChairSkill, false, -1); } - + return false; } - + public boolean registerChairBuff() { if (!YamlConfig.config.server.USE_CHAIR_EXTRAHEAL) { return false; } - + int skillId = getJobMapChair(job); int skillLv = getSkillLevel(skillId); - if(skillLv > 0) { + if (skillLv > 0) { MapleStatEffect mapChairSkill = SkillFactory.getSkill(skillId).getEffect(skillLv); mapChairSkill.applyTo(this); return true; } - + return false; } - + public int getChair() { return chair.get(); } - + public String getChalkboard() { return this.chalktext; } - + public MapleClient getClient() { return client; } - + public AbstractPlayerInteraction getAbstractPlayerInteraction() { return client.getAbstractPlayerInteraction(); } - + private List getQuests() { synchronized (quests) { return new ArrayList<>(quests.values()); } } - + public final List getCompletedQuests() { List ret = new LinkedList<>(); for (MapleQuestStatus qs : getQuests()) { @@ -4641,7 +4638,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return Collections.unmodifiableList(ret); } - + public List getCrushRings() { Collections.sort(crushRings); return crushRings; @@ -4683,7 +4680,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public MapleDoor getPlayerDoor() { prtLock.lock(); try { @@ -4692,7 +4689,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public MapleDoor getMainTownDoor() { for (MapleDoor door : getDoors()) { if (door.getTownPortal().getId() == 0x80) { @@ -4702,7 +4699,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } - + public void applyPartyDoor(MapleDoor door, boolean partyUpdate) { MapleParty chrParty; prtLock.lock(); @@ -4710,7 +4707,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!partyUpdate) { pdoor = door; } - + chrParty = getParty(); if (chrParty != null) { chrParty.addDoor(id, door); @@ -4718,21 +4715,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + silentPartyUpdateInternal(chrParty); } - + public MapleDoor removePartyDoor(boolean partyUpdate) { MapleDoor ret = null; MapleParty chrParty; - + prtLock.lock(); try { chrParty = getParty(); if (chrParty != null) { chrParty.removeDoor(id); } - + if (!partyUpdate) { ret = pdoor; pdoor = null; @@ -4740,11 +4737,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + silentPartyUpdateInternal(chrParty); return ret; } - + private void removePartyDoor(MapleParty formerParty) { // player is no longer registered at this party formerParty.removeDoor(id); } @@ -4761,10 +4758,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + public MapleMarriage getMarriageInstance() { EventInstanceManager eim = getEventInstance(); - + if (eim != null || !(eim instanceof MapleMarriage)) { return (MapleMarriage) eim; } else { @@ -4776,7 +4773,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { Set petExclude = excluded.get(petId); - + if (petExclude != null) { petExclude.clear(); } else { @@ -4786,7 +4783,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void addExcluded(int petId, int x) { chrLock.lock(); try { @@ -4795,18 +4792,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void commitExcludedItems() { Map> petExcluded = this.getExcluded(); - + chrLock.lock(); try { excludedItems.clear(); } finally { chrLock.unlock(); } - - for(Map.Entry> pe : petExcluded.entrySet()) { + + for (Map.Entry> pe : petExcluded.entrySet()) { byte petIndex = this.getPetIndex(pe.getKey()); if (petIndex < 0) { continue; @@ -4818,7 +4815,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { - for(Integer itemid: exclItems) { + for (Integer itemid : exclItems) { excludedItems.add(itemid); } } finally { @@ -4827,10 +4824,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void exportExcludedItems(MapleClient c) { Map> petExcluded = this.getExcluded(); - for(Map.Entry> pe : petExcluded.entrySet()) { + for (Map.Entry> pe : petExcluded.entrySet()) { byte petIndex = this.getPetIndex(pe.getKey()); if (petIndex < 0) { continue; @@ -4842,7 +4839,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public Map> getExcluded() { chrLock.lock(); try { @@ -4851,7 +4848,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public Set getExcludedItems() { chrLock.lock(); try { @@ -4872,69 +4869,69 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean hasNoviceExpRate() { return YamlConfig.config.server.USE_ENFORCE_NOVICE_EXPRATE && isBeginnerJob() && level < 11; } - + public int getExpRate() { if (hasNoviceExpRate()) { // base exp rate 1x for early levels idea thanks to Vcoc return 1; } - + return expRate; } - + public int getCouponExpRate() { return expCoupon; } - + public int getRawExpRate() { return expRate / (expCoupon * getWorldServer().getExpRate()); } - + public int getDropRate() { return dropRate; } - + public int getCouponDropRate() { return dropCoupon; } - + public int getRawDropRate() { return dropRate / (dropCoupon * getWorldServer().getDropRate()); } - + public int getBossDropRate() { World w = getWorldServer(); return (dropRate / w.getDropRate()) * w.getBossDropRate(); } - + public int getMesoRate() { return mesoRate; } - + public int getCouponMesoRate() { return mesoCoupon; } - + public int getRawMesoRate() { return mesoRate / (mesoCoupon * getWorldServer().getMesoRate()); } - + public int getQuestExpRate() { if (hasNoviceExpRate()) { return 1; } - + World w = getWorldServer(); return w.getExpRate() * w.getQuestRate(); } - + public int getQuestMesoRate() { World w = getWorldServer(); return w.getMesoRate() * w.getQuestRate(); } - + public float getCardRate(int itemid) { float rate = 100.0f; - + if (itemid == 0) { MapleStatEffect mseMeso = getBuffEffect(BuffStat.MESO_UP_BY_ITEM); if (mseMeso != null) { @@ -4946,10 +4943,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { rate += mseItem.getCardRate(mapid, itemid); } } - + return rate / 100; } - + public int getFace() { return face; } @@ -4959,16 +4956,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public MapleFamily getFamily() { - if(familyEntry != null) return familyEntry.getFamily(); - else return null; + if (familyEntry != null) { + return familyEntry.getFamily(); + } else { + return null; + } } - + public MapleFamilyEntry getFamilyEntry() { return familyEntry; } - + public void setFamilyEntry(MapleFamilyEntry entry) { - if(entry != null) setFamilyId(entry.getFamily().getID()); + if (entry != null) { + setFamilyId(entry.getFamily().getID()); + } this.familyEntry = entry; } @@ -4979,11 +4981,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean getFinishedDojoTutorial() { return finishedDojoTutorial; } - + public void setUsedStorage() { usedStorage = true; } - + public List getFriendshipRings() { Collections.sort(friendshipRings); return friendshipRings; @@ -5005,16 +5007,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } } - + public MapleAlliance getAlliance() { - if(mgc != null) { + if (mgc != null) { try { return Server.getInstance().getAlliance(getGuild().getAllianceId()); } catch (Exception ex) { ex.printStackTrace(); } } - + return null; } @@ -5055,7 +5057,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return -1; } - + public static int getIdByName(String name) { final int id; try (Connection con = DatabaseConnection.getConnection(); @@ -5108,14 +5110,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return (inventory[ItemConstants.getInventoryType(itemid).ordinal()].findById(itemid) != null) || (checkEquipped && inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } - + public boolean haveItemEquipped(int itemid) { return (inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } - + public boolean haveWeddingRing() { - int rings[] = {1112806, 1112803, 1112807, 1112809}; - + int[] rings = {1112806, 1112803, 1112807, 1112809}; + for (int ringid : rings) { if (haveItemWithId(ringid, true)) { return true; @@ -5124,7 +5126,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } - + public int getItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countById(itemid); if (checkEquipped) { @@ -5132,7 +5134,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return count; } - + public int getCleanItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countNotOwnedById(itemid); if (checkEquipped) { @@ -5172,11 +5174,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getLevel() { return level; } - + public int getFh() { Point pos = this.getPosition(); pos.y -= 6; - + if (map.getFootholds().findBelow(pos) == null) { return 0; } else { @@ -5194,7 +5196,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public MapleRing getMarriageRing() { return partnerId > 0 ? marriageRing : null; } - + public int getMasterLevel(int skill) { SkillEntry ret = skills.get(SkillFactory.getSkill(skill)); if (ret == null) { @@ -5209,7 +5211,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return skills.get(skill).masterlevel; } - + public int getTotalStr() { return localstr; } @@ -5229,23 +5231,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getTotalMagic() { return localmagic; } - + public int getTotalWatk() { return localwatk; } - + public int getMaxClassLevel() { return isCygnus() ? 120 : 200; } - + public int getMaxLevel() { - if(!YamlConfig.config.server.USE_ENFORCE_JOB_LEVEL_RANGE || isGmJob()) { + if (!YamlConfig.config.server.USE_ENFORCE_JOB_LEVEL_RANGE || isGmJob()) { return getMaxClassLevel(); } - + return GameConstants.getJobMaxLevel(job); } - + public int getMeso() { return meso.get(); } @@ -5253,7 +5255,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getMerchantMeso() { return merchantmeso; } - + public int getMerchantNetMeso() { int elapsedDays = 0; @@ -5274,7 +5276,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { elapsedDays = 100; } - long netMeso = (long) merchantmeso; // negative mesos issues found thanks to Flash, Vcoc + long netMeso = merchantmeso; // negative mesos issues found thanks to Flash, Vcoc netMeso = (netMeso * (100 - elapsedDays)) / 100; return (int) netMeso; } @@ -5290,7 +5292,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public MapleGuildCharacter getMGC() { return mgc; } - + public void setMGC(MapleGuildCharacter mgc) { this.mgc = mgc; } @@ -5305,37 +5307,37 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setMPC(MaplePartyCharacter mpc) { this.mpc = mpc; } - + public int getTargetHpBarHash() { return this.targetHpBarHash; } - + public void setTargetHpBarHash(int mobHash) { this.targetHpBarHash = mobHash; } - + public long getTargetHpBarTime() { return this.targetHpBarTime; } - + public void setTargetHpBarTime(long timeNow) { this.targetHpBarTime = timeNow; } - + public void setPlayerAggro(int mobHash) { setTargetHpBarHash(mobHash); setTargetHpBarTime(System.currentTimeMillis()); } - + public void resetPlayerAggro() { - if(getWorldServer().unregisterDisabledServerMessage(id)) { + if (getWorldServer().unregisterDisabledServerMessage(id)) { client.announceServerMessage(); } - + setTargetHpBarHash(0); setTargetHpBarTime(0); } - + public MapleMiniGame getMiniGame() { return miniGame; } @@ -5428,15 +5430,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - - public List getPartyMembersOnline() { - List list = new LinkedList<>(); - + + public List getPartyMembersOnline() { + List list = new LinkedList<>(); + prtLock.lock(); try { - if(party != null) { - for(MaplePartyCharacter mpc: party.getMembers()) { - MapleCharacter mc = mpc.getPlayer(); + if (party != null) { + for (MaplePartyCharacter mpc : party.getMembers()) { + Character mc = mpc.getPlayer(); if (mc != null) { list.add(mc); } @@ -5445,22 +5447,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + return list; } - - public List getPartyMembersOnSameMap() { - List list = new LinkedList<>(); + + public List getPartyMembersOnSameMap() { + List list = new LinkedList<>(); int thisMapHash = this.getMap().hashCode(); - + prtLock.lock(); try { - if(party != null) { - for(MaplePartyCharacter mpc: party.getMembers()) { - MapleCharacter chr = mpc.getPlayer(); + if (party != null) { + for (MaplePartyCharacter mpc : party.getMembers()) { + Character chr = mpc.getPlayer(); if (chr != null) { MapleMap chrMap = chr.getMap(); - if(chrMap != null && chrMap.hashCode() == thisMapHash && chr.isLoggedinWorld()) { + if (chrMap != null && chrMap.hashCode() == thisMapHash && chr.isLoggedinWorld()) { list.add(chr); } } @@ -5469,49 +5471,49 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + return list; } - - public boolean isPartyMember(MapleCharacter chr) { + + public boolean isPartyMember(Character chr) { return isPartyMember(chr.getId()); } - + public boolean isPartyMember(int cid) { prtLock.lock(); try { - if(party != null) { + if (party != null) { return party.getMemberById(cid) != null; } } finally { prtLock.unlock(); } - + return false; } - + public MaplePlayerShop getPlayerShop() { return playerShop; } - + public MapleRockPaperScissor getRPS() { // thanks inhyuk for suggesting RPS addition return rps; } - + public void setGMLevel(int level) { this.gmLevel = Math.min(level, 6); this.gmLevel = Math.max(level, 0); - + whiteChat = gmLevel >= 4; // thanks ozanrijen for suggesting default white chat } - + public void closePartySearchInteractions() { this.getWorldServer().getPartySearchCoordinator().unregisterPartyLeader(this); if (canRecvPartySearchInvite) { this.getWorldServer().getPartySearchCoordinator().detachPlayer(this); } } - + public void closePlayerInteractions() { closeNpcShop(); closeTrade(); @@ -5520,29 +5522,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { closeRPS(); closeHiredMerchant(false); closePlayerMessenger(); - + client.closePlayerScriptInteractions(); resetPlayerAggro(); } - + public void closeNpcShop() { setShop(null); } - + public void closeTrade() { MapleTrade.cancelTrade(this, MapleTrade.TradeResult.PARTNER_CANCEL); } - + public void closePlayerShop() { MaplePlayerShop mps = this.getPlayerShop(); if (mps == null) { return; } - + if (mps.isOwner(this)) { mps.setOpen(false); getWorldServer().unregisterPlayerShop(mps); - + for (MaplePlayerShopItem mpsi : mps.getItems()) { if (mpsi.getBundles() >= 2) { Item iItem = mpsi.getItem().copy(); @@ -5558,26 +5560,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.setPlayerShop(null); } - + public void closeMiniGame(boolean forceClose) { MapleMiniGame game = this.getMiniGame(); if (game == null) { return; } - + if (game.isOwner(this)) { game.closeRoom(forceClose); } else { game.removeVisitor(forceClose, this); } } - + public void closeHiredMerchant(boolean closeMerchant) { MapleHiredMerchant merchant = this.getHiredMerchant(); if (merchant == null) { return; } - + if (closeMerchant) { if (merchant.isOwner(this) && merchant.getItems().isEmpty()) { merchant.forceClose(); @@ -5599,16 +5601,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void closePlayerMessenger() { MapleMessenger m = this.getMessenger(); if (m == null) { return; } - + World w = getWorldServer(); MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(this, this.getMessengerPosition()); - + w.leaveMessenger(m.getId(), messengerplayer); this.setMessenger(null); this.setMessengerPosition(4); @@ -5627,7 +5629,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (index < 0) { return null; } - + petLock.lock(); try { return pets[index]; @@ -5651,7 +5653,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public byte getPetIndex(Pet pet) { petLock.lock(); try { @@ -5682,11 +5684,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public MapleQuestStatus getQuest(final int quest) { return getQuest(MapleQuest.getInstance(quest)); } - + public MapleQuestStatus getQuest(MapleQuest quest) { synchronized (quests) { short questid = quest.getId(); @@ -5698,13 +5700,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return qs; } } - + //---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ---- - + public final void setQuestAdd(final MapleQuest quest, final byte status, final String customData) { synchronized (quests) { if (!quests.containsKey(quest.getId())) { - final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById((int)status)); + final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById(status)); stat.setCustomData(customData); quests.put(quest.getId(), stat); } @@ -5735,12 +5737,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } //---- /\ /\ /\ /\ /\ /\ /\ NOT TESTED /\ /\ /\ /\ /\ /\ /\ /\ /\ ---- - + public boolean needQuestItem(int questid, int itemid) { if (questid <= 0) { //For non quest items :3 return true; } - + int amountNeeded, questStatus = this.getQuestStatus(questid); if (questStatus == 0) { amountNeeded = MapleQuest.getInstance(questid).getStartItemAmountNeeded(itemid); @@ -5755,7 +5757,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return true; } } - + return getInventory(ItemConstants.getInventoryType(itemid)).countById(itemid) < amountNeeded; } @@ -5770,7 +5772,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void clearSavedLocation(SavedLocationType type) { savedLocations[type.ordinal()] = null; } - + public int peekSavedLocation(String type) { SavedLocation sl = savedLocations[SavedLocationType.fromString(type).ordinal()]; if (sl == null) { @@ -5778,11 +5780,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return sl.getMapId(); } - + public int getSavedLocation(String type) { int m = peekSavedLocation(type); clearSavedLocation(SavedLocationType.fromString(type)); - + return m; } @@ -5797,7 +5799,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public Map getSkills() { return Collections.unmodifiableMap(skills); } - + public int getSkillLevel(int skill) { SkillEntry ret = skills.get(SkillFactory.getSkill(skill)); if (ret == null) { @@ -5845,7 +5847,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return Collections.unmodifiableList(ret); } - + public MapleStatEffect getStatForBuff(BuffStat effect) { effLock.lock(); chrLock.lock(); @@ -5868,19 +5870,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public Collection getSummonsValues() { return summons.values(); } - + public void clearSummons() { summons.clear(); } - + public MapleSummon getSummonByKey(int id) { return summons.get(id); } - + public boolean isSummonsEmpty() { return summons.isEmpty(); } - + public boolean containsSummon(MapleSummon summon) { return summons.containsValue(summon); } @@ -5904,7 +5906,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getWorld() { return world; } - + public World getWorldServer() { return Server.getInstance().getWorld(world); } @@ -5919,7 +5921,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addCooldown(skillid, timeNow, time); } } - + public int gmLevel() { return gmLevel; } @@ -5927,11 +5929,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void guildUpdate() { mgc.setLevel(level); mgc.setJobId(job.getId()); - + if (this.guildid < 1) { return; } - + try { Server.getInstance().memberLevelJobUpdate(this.mgc); //Server.getInstance().getGuild(guildid, world, mgc).gainGP(40); @@ -5943,7 +5945,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public void handleEnergyChargeGain() { // to get here energychargelevel has to be > 0 Skill energycharge = isCygnus() ? SkillFactory.getSkill(ThunderBreaker.ENERGY_CHARGE) : SkillFactory.getSkill(Marauder.ENERGY_CHARGE); MapleStatEffect ceffect; @@ -5963,7 +5965,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (energybar >= 10000 && energybar < 11000) { energybar = 15000; - final MapleCharacter chr = this; + final Character chr = this; tMan.schedule(new Runnable() { @Override public void run() { @@ -6000,7 +6002,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return script.equals(e); } - public void hasGivenFame(MapleCharacter to) { + public void hasGivenFame(Character to) { lastfametime = System.currentTimeMillis(); lastmonthfameids.add(Integer.valueOf(to.getId())); try (Connection con = DatabaseConnection.getConnection(); @@ -6020,38 +6022,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean haveItem(int itemid) { return getItemQuantity(itemid, ItemConstants.isEquipment(itemid)) > 0; } - + public boolean haveCleanItem(int itemid) { return getCleanItemQuantity(itemid, ItemConstants.isEquipment(itemid)) > 0; } - + public boolean hasEmptySlot(int itemId) { return getInventory(ItemConstants.getInventoryType(itemId)).getNextFreeSlot() > -1; } - + public boolean hasEmptySlot(byte invType) { return getInventory(InventoryType.getByType(invType)).getNextFreeSlot() > -1; } public void increaseGuildCapacity() { int cost = MapleGuild.getIncreaseGuildCost(getGuild().getCapacity()); - + if (getMeso() < cost) { dropMessage(1, "You don't have enough mesos."); return; } - - if(Server.getInstance().increaseGuildCapacity(guildid)) { + + if (Server.getInstance().increaseGuildCapacity(guildid)) { gainMeso(-cost, true, false, true); } else { dropMessage(1, "Your guild already reached the maximum capacity of players."); } } - + private boolean canBuyback(int fee, boolean usingMesos) { return (usingMesos ? this.getMeso() : cashshop.getCash(1)) >= fee; } - + private void applyBuybackFee(int fee, boolean usingMesos) { if (usingMesos) { this.gainMeso(-fee); @@ -6059,30 +6061,30 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cashshop.gainCash(1, -fee); } } - + private long getNextBuybackTime() { return lastBuyback + YamlConfig.config.server.BUYBACK_COOLDOWN_MINUTES * 60 * 1000; } - + private boolean isBuybackInvincible() { return Server.getInstance().getCurrentTime() - lastBuyback < 4200; } - + private int getBuybackFee() { float fee = YamlConfig.config.server.BUYBACK_FEE; int grade = Math.min(Math.max(level, 30), 120) - 30; - + fee += (grade * YamlConfig.config.server.BUYBACK_LEVEL_STACK_FEE); if (YamlConfig.config.server.USE_BUYBACK_WITH_MESOS) { fee *= YamlConfig.config.server.BUYBACK_MESO_MULTIPLIER; } - + return (int) Math.floor(fee); } - + public void showBuybackInfo() { String s = "#eBUYBACK STATUS#n\r\n\r\nCurrent buyback fee: #b" + getBuybackFee() + " " + (YamlConfig.config.server.USE_BUYBACK_WITH_MESOS ? "mesos" : "NX") + "#k\r\n\r\n"; - + long timeNow = Server.getInstance().getCurrentTime(); boolean avail = true; if (!isAlive()) { @@ -6096,47 +6098,47 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } s += "\r\n"; } - + if (timeNow < getNextBuybackTime() && avail) { s += "Buyback available in #r" + getTimeRemaining(getNextBuybackTime() - timeNow) + "#k"; s += "\r\n"; } else { s += "Buyback #bavailable#k"; } - + this.showHint(s); } - + private static String getTimeRemaining(long timeLeft) { int seconds = (int) Math.floor(timeLeft / 1000) % 60; - int minutes = (int) Math.floor(timeLeft / (1000*60)) % 60; - + int minutes = (int) Math.floor(timeLeft / (1000 * 60)) % 60; + return (minutes > 0 ? (String.format("%02d", minutes) + " minutes, ") : "") + String.format("%02d", seconds) + " seconds"; } - + public boolean couldBuyback() { // Ronan's buyback system long timeNow = Server.getInstance().getCurrentTime(); - + if (timeNow - lastDeathtime > YamlConfig.config.server.BUYBACK_RETURN_MINUTES * 60 * 1000) { this.dropMessage(5, "The period of time to decide has expired, therefore you are unable to buyback."); return false; } - + long nextBuybacktime = getNextBuybackTime(); if (timeNow < nextBuybacktime) { long timeLeft = nextBuybacktime - timeNow; this.dropMessage(5, "Next buyback available in " + getTimeRemaining(timeLeft) + "."); return false; } - + boolean usingMesos = YamlConfig.config.server.USE_BUYBACK_WITH_MESOS; int fee = getBuybackFee(); - + if (!canBuyback(fee, usingMesos)) { this.dropMessage(5, "You don't have " + fee + " " + (usingMesos ? "mesos" : "NX") + " to buyback."); return false; } - + lastBuyback = timeNow; applyBuybackFee(fee, usingMesos); return true; @@ -6156,12 +6158,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean isGmJob() { int jn = job.getJobNiche(); return jn >= 8 && jn <= 9; } - + public boolean isCygnus() { return getJobType() == 1; } @@ -6195,15 +6197,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public boolean isGuildLeader() { // true on guild master or jr. master return guildid > 0 && guildRank < 3; } - + public boolean attemptCatchFish(int baitLevel) { return YamlConfig.config.server.USE_FISHING_SYSTEM && GameConstants.isFishingArea(mapid) && this.getPosition().getY() > 0 && ItemConstants.isFishingChair(chair.get()) && this.getWorldServer().registerFisherPlayer(this, baitLevel); } - + public void leaveMap() { releaseControlledMonsters(); visibleMapObjects.clear(); @@ -6211,13 +6213,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (hpDecreaseTask != null) { hpDecreaseTask.cancel(false); } - + AriantColiseum arena = this.getAriantColiseum(); if (arena != null) { arena.leaveArena(this); } } - + private int getChangedJobSp(MapleJob newJob) { int curSp = getUsedSp(newJob) + getJobRemainingSp(newJob); int spGain = 0; @@ -6225,54 +6227,54 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (curSp < expectedSp) { spGain += (expectedSp - curSp); } - + return getSpGain(spGain, curSp, newJob); } - + private int getUsedSp(MapleJob job) { int jobId = job.getId(); int spUsed = 0; - + for (Entry s : this.getSkills().entrySet()) { Skill skill = s.getKey(); if (GameConstants.isInJobTree(skill.getId(), jobId) && !skill.isBeginnerSkill()) { spUsed += s.getValue().skillevel; } } - + return spUsed; } - + private int getJobLevelSp(int level, MapleJob job, int jobBranch) { if (getJobStyleInternal(job.getId(), (byte) 0x40) == MapleJob.MAGICIAN) { level += 2; // starts earlier, level 8 } - + return 3 * level + GameConstants.getChangeJobSpUpgrade(jobBranch); } - + private int getJobMaxSp(MapleJob job) { int jobBranch = GameConstants.getJobBranch(job); int jobRange = GameConstants.getJobUpgradeLevelRange(jobBranch); return getJobLevelSp(jobRange, job, jobBranch); } - + private int getJobRemainingSp(MapleJob job) { int skillBook = GameConstants.getSkillBook(job.getId()); - + int ret = 0; for (int i = 0; i <= skillBook; i++) { ret += this.getRemainingSp(i); } - + return ret; } - + private int getSpGain(int spGain, MapleJob job) { int curSp = getUsedSp(job) + getJobRemainingSp(job); return getSpGain(spGain, curSp, job); } - + private int getSpGain(int spGain, int curSp, MapleJob job) { int maxSp = getJobMaxSp(job); @@ -6280,22 +6282,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int jobBranch = GameConstants.getJobBranch(job); return spGain; } - + private void levelUpGainSp() { if (GameConstants.getJobBranch(job) == 0) { return; } - + int spGain = 3; if (YamlConfig.config.server.USE_ENFORCE_JOB_SP_RANGE && !GameConstants.hasSPTable(job)) { spGain = getSpGain(spGain, job); } - + if (spGain > 0) { gainSp(spGain, GameConstants.getSkillBook(job.getId()), true); } } - + public synchronized void levelUp(boolean takeexp) { Skill improvingMaxHP = null; Skill improvingMaxMP = null; @@ -6308,7 +6310,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.lock(); try { gainAp(5, true); - + int str = 0, dex = 0; if (level < 6) { str += 5; @@ -6324,7 +6326,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int remainingAp = 5; - + if (isCygnus()) { if (level > 10) { if (level <= 17) { @@ -6334,7 +6336,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + gainAp(remainingAp, true); } @@ -6408,7 +6410,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ThreadManager.getInstance().newTask(new Runnable() { @Override public void run() { - MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), MapleCharacter.this); + MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), Character.this); } }); } @@ -6420,9 +6422,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { level = maxClassLevel; //To prevent levels past the maximum } - + levelUpGainSp(); - + effLock.lock(); statWlock.lock(); try { @@ -6440,7 +6442,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(MapleStat.MAXMP, clientmaxmp)); statup.add(new Pair<>(MapleStat.STR, str)); statup.add(new Pair<>(MapleStat.DEX, dex)); - + sendPacket(PacketCreator.updatePlayerStats(statup, true, this)); } finally { statWlock.unlock(); @@ -6463,7 +6465,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.yellowMessage("You reached level " + level + ". Congratulations! As a token of your success, your inventory has been expanded a little bit."); - } + } } if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL == true) { //For the rate upgrade revertLastPlayerRates(); @@ -6492,18 +6494,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { levelUpMessages(); guildUpdate(); - + MapleFamilyEntry familyEntry = getFamilyEntry(); - if(familyEntry != null) { + if (familyEntry != null) { familyEntry.giveReputationToSenior(YamlConfig.config.server.FAMILY_REP_PER_LEVELUP, true); MapleFamilyEntry senior = familyEntry.getSenior(); - if(senior != null) { //only send the message to direct senior - MapleCharacter seniorChr = senior.getChr(); - if(seniorChr != null) seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName())); + if (senior != null) { //only send the message to direct senior + Character seniorChr = senior.getChr(); + if (seniorChr != null) { + seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName())); + } } } } - + public boolean leaveParty() { MapleParty party; boolean partyLeader; @@ -6517,7 +6521,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (party != null) { - if(partyLeader) party.assignNewLeader(client); + if (partyLeader) { + party.assignNewLeader(client); + } MapleParty.leaveParty(party, client); return true; @@ -6612,42 +6618,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { yellowMessage("Very nicely done! You have reached the so-long dreamed LEVEL 200!!! You are truly a hero among men, cheers upon you!"); } } - + public void setPlayerRates() { - this.expRate *= GameConstants.getPlayerBonusExpRate(this.level / 20); + this.expRate *= GameConstants.getPlayerBonusExpRate(this.level / 20); this.mesoRate *= GameConstants.getPlayerBonusMesoRate(this.level / 20); this.dropRate *= GameConstants.getPlayerBonusDropRate(this.level / 20); } public void revertLastPlayerRates() { - this.expRate /= GameConstants.getPlayerBonusExpRate((this.level - 1) / 20); + this.expRate /= GameConstants.getPlayerBonusExpRate((this.level - 1) / 20); this.mesoRate /= GameConstants.getPlayerBonusMesoRate((this.level - 1) / 20); this.dropRate /= GameConstants.getPlayerBonusDropRate((this.level - 1) / 20); } - + public void revertPlayerRates() { - this.expRate /= GameConstants.getPlayerBonusExpRate(this.level / 20); + this.expRate /= GameConstants.getPlayerBonusExpRate(this.level / 20); this.mesoRate /= GameConstants.getPlayerBonusMesoRate(this.level / 20); this.dropRate /= GameConstants.getPlayerBonusDropRate(this.level / 20); } - + public void setWorldRates() { World worldz = getWorldServer(); this.expRate *= worldz.getExpRate(); this.mesoRate *= worldz.getMesoRate(); this.dropRate *= worldz.getDropRate(); } - + public void revertWorldRates() { World worldz = getWorldServer(); this.expRate /= worldz.getExpRate(); this.mesoRate /= worldz.getMesoRate(); this.dropRate /= worldz.getDropRate(); } - + private void setCouponRates() { List couponEffects; - + Collection cashItems = this.getInventory(InventoryType.CASH).list(); chrLock.lock(); try { @@ -6656,20 +6662,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - - for(Integer couponId: couponEffects) { + + for (Integer couponId : couponEffects) { commitBuffCoupon(couponId); } } - + private void revertCouponRates() { revertCouponsEffects(); } - + public void updateCouponRates() { Inventory cashInv = this.getInventory(InventoryType.CASH); - if (cashInv == null) return; - + if (cashInv == null) { + return; + } + effLock.lock(); chrLock.lock(); cashInv.lockInventory(); @@ -6682,52 +6690,52 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void resetPlayerRates() { expRate = 1; mesoRate = 1; dropRate = 1; - + expCoupon = 1; mesoCoupon = 1; dropCoupon = 1; } - + private int getCouponMultiplier(int couponId) { return activeCouponRates.get(couponId); } - + private void setExpCouponRate(int couponId, int couponQty) { this.expCoupon *= (getCouponMultiplier(couponId) * couponQty); } - + private void setDropCouponRate(int couponId, int couponQty) { this.dropCoupon *= (getCouponMultiplier(couponId) * couponQty); this.mesoCoupon *= (getCouponMultiplier(couponId) * couponQty); } - + private void revertCouponsEffects() { dispelBuffCoupons(); - + this.expRate /= this.expCoupon; this.dropRate /= this.dropCoupon; this.mesoRate /= this.mesoCoupon; - + this.expCoupon = 1; this.dropCoupon = 1; this.mesoCoupon = 1; } - + private List activateCouponsEffects() { List toCommitEffect = new LinkedList<>(); - - if(YamlConfig.config.server.USE_STACK_COUPON_RATES) { - for(Entry coupon: activeCoupons.entrySet()) { + + if (YamlConfig.config.server.USE_STACK_COUPON_RATES) { + for (Entry coupon : activeCoupons.entrySet()) { int couponId = coupon.getKey(); int couponQty = coupon.getValue(); toCommitEffect.add(couponId); - + if (ItemConstants.isExpCoupon(couponId)) { setExpCouponRate(couponId, couponQty); } else { @@ -6736,43 +6744,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int maxExpRate = 1, maxDropRate = 1, maxExpCouponId = -1, maxDropCouponId = -1; - - for(Entry coupon: activeCoupons.entrySet()) { + + for (Entry coupon : activeCoupons.entrySet()) { int couponId = coupon.getKey(); - if(ItemConstants.isExpCoupon(couponId)) { - if(maxExpRate < getCouponMultiplier(couponId)) { + if (ItemConstants.isExpCoupon(couponId)) { + if (maxExpRate < getCouponMultiplier(couponId)) { maxExpCouponId = couponId; maxExpRate = getCouponMultiplier(couponId); } - } - else { - if(maxDropRate < getCouponMultiplier(couponId)) { + } else { + if (maxDropRate < getCouponMultiplier(couponId)) { maxDropCouponId = couponId; maxDropRate = getCouponMultiplier(couponId); } } } - + if (maxExpCouponId > -1) { toCommitEffect.add(maxExpCouponId); } if (maxDropCouponId > -1) { toCommitEffect.add(maxDropCouponId); } - + this.expCoupon = maxExpRate; this.dropCoupon = maxDropRate; this.mesoCoupon = maxDropRate; } - + this.expRate *= this.expCoupon; this.dropRate *= this.dropCoupon; this.mesoRate *= this.mesoCoupon; - + return toCommitEffect; } - + private void setActiveCoupons(Collection cashItems) { activeCoupons.clear(); activeCouponRates.clear(); @@ -6780,11 +6787,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Map coupons = Server.getInstance().getCouponRates(); List active = Server.getInstance().getActiveCoupons(); - for (Item it: cashItems) { + for (Item it : cashItems) { if (ItemConstants.isRateCoupon(it.getItemId()) && active.contains(it.getItemId())) { Integer count = activeCoupons.get(it.getItemId()); - if(count != null) { + if (count != null) { activeCoupons.put(it.getItemId(), count + 1); } else { activeCoupons.put(it.getItemId(), 1); @@ -6793,33 +6800,33 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + private void commitBuffCoupon(int couponid) { if (!isLoggedin() || getCashShop().isOpened()) { return; } - + MapleStatEffect mse = ii.getItemEffect(couponid); mse.applyTo(this); } - + public void dispelBuffCoupons() { List allBuffs = getAllStatups(); - + for (MapleBuffStatValueHolder mbsvh : allBuffs) { if (ItemConstants.isRateCoupon(mbsvh.effect.getSourceId())) { cancelEffect(mbsvh.effect, false, mbsvh.startTime); } } } - + public Set getActiveCoupons() { chrLock.lock(); try { return Collections.unmodifiableSet(activeCoupons.keySet()); } finally { chrLock.unlock(); - } + } } public void addPlayerRing(MapleRing ring) { @@ -6832,10 +6839,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.addCrushRing(ring); } } - - public static MapleCharacter loadCharacterEntryFromDB(ResultSet rs, List equipped) { - MapleCharacter ret = new MapleCharacter(); - + + public static Character loadCharacterEntryFromDB(ResultSet rs, List equipped) { + Character ret = new Character(); + try { ret.accountid = rs.getInt("accountid"); ret.id = rs.getInt("id"); @@ -6870,8 +6877,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.rankMove = rs.getInt("rankMove"); ret.jobRank = rs.getInt("jobRank"); ret.jobRankMove = rs.getInt("jobRankMove"); - - if(equipped != null) { // players can have no equipped items at all, ofc + + if (equipped != null) { // players can have no equipped items at all, ofc Inventory inv = ret.inventory[InventoryType.EQUIPPED.ordinal()]; for (Item item : equipped) { inv.addItemFromDB(item); @@ -6880,13 +6887,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } catch (SQLException sqle) { sqle.printStackTrace(); } - + return ret; } - - public MapleCharacter generateCharacterEntry() { - MapleCharacter ret = new MapleCharacter(); - + + public Character generateCharacterEntry() { + Character ret = new Character(); + ret.accountid = this.getAccountID(); ret.id = this.getId(); ret.name = this.getName(); @@ -6894,9 +6901,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.skinColor = this.getSkinColor(); ret.face = this.getFace(); ret.hair = this.getHair(); - + // skipping pets, probably unneeded here - + ret.level = this.getLevel(); ret.job = this.getJob(); ret.str = this.getStr(); @@ -6914,38 +6921,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.gachaexp.set(this.getGachaExp()); ret.mapid = this.getMapId(); ret.initialSpawnPoint = this.getInitialSpawnpoint(); - + ret.inventory[InventoryType.EQUIPPED.ordinal()] = this.getInventory(InventoryType.EQUIPPED); - + ret.setGMLevel(this.gmLevel()); ret.world = this.getWorld(); ret.rank = this.getRank(); ret.rankMove = this.getRankMove(); ret.jobRank = this.getJobRank(); ret.jobRankMove = this.getJobRankMove(); - + return ret; } - + private void loadCharSkillPoints(String[] skillPoints) { - int sps[] = new int[skillPoints.length]; + int[] sps = new int[skillPoints.length]; for (int i = 0; i < skillPoints.length; i++) { sps[i] = Integer.parseInt(skillPoints[i]); } - + setRemainingSp(sps); } - + public int getRemainingSp() { return getRemainingSp(job.getId()); //default } - + public void updateRemainingSp(int remainingSp) { updateRemainingSp(remainingSp, GameConstants.getSkillBook(job.getId())); } - - public static MapleCharacter loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException { - MapleCharacter ret = new MapleCharacter(); + + public static Character loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException { + Character ret = new Character(); ret.client = client; ret.id = charid; @@ -7444,10 +7451,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return null; } - + public void reloadQuestExpirations() { - for(MapleQuestStatus mqs: getStartedQuests()) { - if(mqs.getExpirationTime() > 0) { + for (MapleQuestStatus mqs : getStartedQuests()) { + if (mqs.getExpirationTime() > 0) { questTimeLimit2(mqs.getQuest(), mqs.getExpirationTime()); } } @@ -7459,7 +7466,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { i = i.replace("rn", "Rn"); i = i.replace("vv", "Vv"); i = i.replace("VV", "Vv"); - + return i; } @@ -7480,7 +7487,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public static class MapleCoolDownValueHolder { - + public int skillId; public long startTime, length; @@ -7510,7 +7517,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else if (id == 1140100 || id == 1140130) { raiseQuestMobCount(9101002); } - + int lastQuestProcessed = 0; try { synchronized (quests) { @@ -7519,7 +7526,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (qs.getStatus() == MapleQuestStatus.Status.COMPLETED || qs.getQuest().canComplete(this, null)) { continue; } - + if (qs.progress(id)) { announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, false); if (qs.getInfoNumber() > 0) { @@ -7529,7 +7536,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } catch (Exception e) { - FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "MapleCharacter.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed); + FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "Character.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed); } } @@ -7550,11 +7557,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { gainCP(-losing); return; } - + cancelAllBuffs(false); dispelDebuffs(); lastDeathtime = Server.getInstance().getCurrentTime(); - + EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.playerKilled(this); @@ -7576,7 +7583,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else if (getJob() != MapleJob.BEGINNER) { //Hmm... if (!FieldLimit.NO_EXP_DECREASE.check(getMap().getFieldLimit())) { // thanks Conrad for noticing missing FieldLimit check int XPdummy = ExpTable.getExpNeededForLevel(getLevel()); - + if (getMap().isTown()) { // thanks MindLove, SIayerMonkey, HaItsNotOver for noting players only lose 1% on town maps XPdummy /= 100; } else { @@ -7586,7 +7593,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { XPdummy /= 20; } } - + int curExp = getExp(); if (curExp > XPdummy) { loseExp(XPdummy, false, false); @@ -7595,7 +7602,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + if (getBuffedValue(BuffStat.MORPH) != null) { cancelEffectFromBuffStat(BuffStat.MORPH); } @@ -7607,14 +7614,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { unsitChairInternal(); sendPacket(PacketCreator.enableActions()); } - + private void unsitChairInternal() { int chairid = chair.get(); if (chairid >= 0) { if (ItemConstants.isFishingChair(chairid)) { this.getWorldServer().unregisterFisherPlayer(this); } - + setChair(-1); if (unregisterChairBuff()) { getMap().broadcastMessage(this, PacketCreator.cancelForeignChairSkillEffect(this.getId()), false); @@ -7625,7 +7632,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.cancelChair(-1)); } - + public void sitChair(int itemId) { if (this.isLoggedinWorld()) { if (itemId >= 1000000) { // sit on item chair @@ -7647,29 +7654,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + private void setChair(int chair) { this.chair.set(chair); } - + public void respawn(int returnMap) { respawn(null, returnMap); // unspecified EIM, don't force EIM unregister in this case } - + public void respawn(EventInstanceManager eim, int returnMap) { if (eim != null) { eim.unregisterPlayer(this); // some event scripts uses this... } changeMap(returnMap); - + cancelAllBuffs(false); // thanks Oblivium91 for finding out players still could revive in area and take damage before returning to town - + if (usedSafetyCharm) { // thanks kvmba for noticing safety charm not providing 30% HP/MP addMPHP((int) Math.ceil(this.getClientMaxHp() * 0.3), (int) Math.ceil(this.getClientMaxMp() * 0.3)); } else { updateHp(50); } - + setStance(0); } @@ -7683,10 +7690,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + addHP(-bloodEffect.getX()); sendPacket(PacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false); + getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false); } }, 4000, 4000); } @@ -7703,7 +7710,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equipwatk = 0; //equipspeed = 0; //equipjump = 0; - + for (Item item : getInventory(InventoryType.EQUIPPED)) { Equip equip = (Equip) item; equipmaxhp += equip.getHp(); @@ -7717,10 +7724,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { //equipspeed += equip.getSpeed(); //equipjump += equip.getJump(); } - + equipchanged = false; } - + localmaxhp += equipmaxhp; localmaxmp += equipmaxmp; localdex += equipdex; @@ -7730,7 +7737,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { localmagic += equipmagic; localwatk += equipwatk; } - + private void reapplyLocalStats() { effLock.lock(); chrLock.lock(); @@ -7854,7 +7861,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private List> recalcLocalStats() { effLock.lock(); chrLock.lock(); @@ -7863,9 +7870,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { List> hpmpupdate = new ArrayList<>(2); int oldlocalmaxhp = localmaxhp; int oldlocalmaxmp = localmaxmp; - + reapplyLocalStats(); - + if (YamlConfig.config.server.USE_FIXED_RATIO_HPMP_UPDATE) { if (localmaxhp != oldlocalmaxhp) { Pair hpUpdate; @@ -7899,7 +7906,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private void updateLocalStats() { prtLock.lock(); effLock.lock(); @@ -7927,7 +7934,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.lock(); try { if (party != null) { - for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { + for (Character partychar : this.getPartyMembersOnSameMap()) { sendPacket(PacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp())); } } @@ -7964,9 +7971,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - if (this.coolDowns.containsKey(skillId)) { - this.coolDowns.remove(skillId); - } + this.coolDowns.remove(skillId); } finally { chrLock.unlock(); effLock.unlock(); @@ -8007,10 +8012,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public synchronized void resetStats() { - if(!YamlConfig.config.server.USE_AUTOASSIGN_STARTERS_AP) { + if (!YamlConfig.config.server.USE_AUTOASSIGN_STARTERS_AP) { return; } - + effLock.lock(); statWlock.lock(); try { @@ -8058,12 +8063,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void resetBattleshipHp() { int bshipLevel = Math.max(getLevel() - 120, 0); // thanks alex12 for noticing battleship HP issues for low-level players this.battleshipHp = 400 * getSkillLevel(SkillFactory.getSkill(Corsair.BATTLE_SHIP)) + (bshipLevel * 200); } - + public void resetEnteredScript() { entered.remove(map.getId()); } @@ -8082,7 +8087,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public synchronized void saveCooldowns() { List listcd = getAllCooldowns(); - + if (!listcd.isEmpty()) { try (Connection con = DatabaseConnection.getConnection()) { deleteWhereCharacterId(con, "DELETE FROM cooldowns WHERE charid = ?"); @@ -8100,24 +8105,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { se.printStackTrace(); } } - + Map> listds = getAllDiseases(); if (!listds.isEmpty()) { try (Connection con = DatabaseConnection.getConnection()) { deleteWhereCharacterId(con, "DELETE FROM playerdiseases WHERE charid = ?"); try (PreparedStatement ps = con.prepareStatement("INSERT INTO playerdiseases (charid, disease, mobskillid, mobskilllv, length) VALUES (?, ?, ?, ?, ?)")) { ps.setInt(1, getId()); - + for (Entry> e : listds.entrySet()) { ps.setInt(2, e.getKey().ordinal()); - + MobSkill ms = e.getValue().getRight(); ps.setInt(3, ms.getSkillId()); ps.setInt(4, ms.getSkillLevel()); ps.setInt(5, e.getValue().getLeft().intValue()); ps.addBatch(); } - + ps.executeBatch(); } } catch (SQLException se) { @@ -8142,19 +8147,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void saveLocationOnWarp() { // suggestion to remember the map before warp command thanks to Lei MaplePortal closest = map.findClosestPortal(getPosition()); int curMapid = getMapId(); - + for (int i = 0; i < savedLocations.length; i++) { if (savedLocations[i] == null) { savedLocations[i] = new SavedLocation(curMapid, closest != null ? closest.getId() : 0); } } } - + public void saveLocation(String type) { MaplePortal closest = map.findClosestPortal(getPosition()); savedLocations[SavedLocationType.fromString(type).ordinal()] = new SavedLocation(getMapId(), closest != null ? closest.getId() : 0); } - + public final boolean insertNewChar(CharacterFactoryRecipe recipe) { str = recipe.getStr(); dex = recipe.getDex(); @@ -8304,7 +8309,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { con.commit(); return true; - } catch (Exception e) { + } catch (Exception e) { con.rollback(); throw e; } finally { @@ -8319,21 +8324,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void saveCharToDB() { - if(YamlConfig.config.server.USE_AUTOSAVE) { + if (YamlConfig.config.server.USE_AUTOSAVE) { Runnable r = new Runnable() { @Override public void run() { saveCharToDB(true); } }; - + CharacterSaveService service = (CharacterSaveService) getWorldServer().getServiceAccess(WorldServices.SAVE_CHARACTER); service.registerSaveCharacter(this.getId(), r); } else { saveCharToDB(true); } } - + //ItemFactory saveItems and monsterbook.saveCards are the most time consuming here. public synchronized void saveCharToDB(boolean notAutosave) { if (!loggedIn) { @@ -8343,9 +8348,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Calendar c = Calendar.getInstance(); if (notAutosave) { - FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime().toString()); + FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime()); } else { - FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime().toString()); + FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime()); } Server.getInstance().updateCharacterEntry(this); @@ -8777,7 +8782,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendKeymap() { sendPacket(PacketCreator.getKeymap(keymap)); } - + public void sendQuickmap() { // send quickslots to user QuickslotBinding pQuickslotKeyMapped = this.m_pQuickslotKeyMapped; @@ -8793,7 +8798,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { // Always send the macro packet to fix a client side bug when switching characters. sendPacket(PacketCreator.getMacros(skillMacros)); } - + public SkillMacro[] getMacros() { return skillMacros; } @@ -8801,7 +8806,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendNote(String to, String msg, byte fame) throws SQLException { sendNote(to, this.getName(), msg, fame); } - + public static void sendNote(String to, String from, String msg, byte fame) throws SQLException { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO notes (`to`, `from`, `message`, `timestamp`, `fame`) VALUES (?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) { @@ -8849,7 +8854,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setChalkboard(String text) { this.chalktext = text; } - + public void setDojoEnergy(int x) { this.dojoEnergy = Math.min(x, 10000); } @@ -8914,7 +8919,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setGuildRank(int _rank) { guildRank = _rank; } - + public void setAllianceRank(int _rank) { allianceRank = _rank; } @@ -8962,14 +8967,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } merchantmeso = set; } - + public synchronized void withdrawMerchantMesos() { int merchantMeso = this.getMerchantNetMeso(); int playerMeso = this.getMeso(); - + if (merchantMeso > 0) { int possible = Integer.MAX_VALUE - playerMeso; - + if (possible > 0) { if (possible < merchantMeso) { this.gainMeso(possible, false); @@ -8981,7 +8986,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int nextMeso = playerMeso + merchantMeso; - + if (nextMeso < 0) { this.gainMeso(-playerMeso, false); this.setMerchantMeso(merchantMeso + playerMeso); @@ -8995,19 +9000,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setHiredMerchant(MapleHiredMerchant merchant) { this.hiredMerchant = merchant; } - + private void hpChangeAction(int oldHp) { boolean playerDied = false; if (hp <= 0) { if (oldHp > hp) { - if(!isBuybackInvincible()) { + if (!isBuybackInvincible()) { playerDied = true; } else { hp = 1; } } } - + final boolean chrDied = playerDied; Runnable r = new Runnable() { @Override @@ -9023,65 +9028,65 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }; if (map != null) { map.registerCharacterStatUpdate(r); - } + } } - + private Pair calcHpRatioUpdate(int newHp, int oldHp) { int delta = newHp - oldHp; this.hp = calcHpRatioUpdate(hp, oldHp, delta); - + hpChangeAction(Short.MIN_VALUE); return new Pair<>(MapleStat.HP, hp); } - + private Pair calcMpRatioUpdate(int newMp, int oldMp) { int delta = newMp - oldMp; this.mp = calcMpRatioUpdate(mp, oldMp, delta); return new Pair<>(MapleStat.MP, mp); } - + private static int calcTransientRatio(float transientpoint) { int ret = (int) transientpoint; return !(ret <= 0 && transientpoint > 0.0f) ? ret : 1; } - + private Pair calcHpRatioTransient() { this.hp = calcTransientRatio(transienthp * localmaxhp); - + hpChangeAction(Short.MIN_VALUE); return new Pair<>(MapleStat.HP, hp); } - + private Pair calcMpRatioTransient() { this.mp = calcTransientRatio(transientmp * localmaxmp); return new Pair<>(MapleStat.MP, mp); } - + private int calcHpRatioUpdate(int curpoint, int maxpoint, int diffpoint) { int curMax = maxpoint; int nextMax = Math.min(30000, maxpoint + diffpoint); - + float temp = curpoint * nextMax; int ret = (int) Math.ceil(temp / curMax); - + transienthp = (maxpoint > nextMax) ? ((float) curpoint) / maxpoint : ((float) ret) / nextMax; return ret; } - + private int calcMpRatioUpdate(int curpoint, int maxpoint, int diffpoint) { int curMax = maxpoint; int nextMax = Math.min(30000, maxpoint + diffpoint); - + float temp = curpoint * nextMax; int ret = (int) Math.ceil(temp / curMax); - + transientmp = (maxpoint > nextMax) ? ((float) curpoint) / maxpoint : ((float) ret) / nextMax; return ret; } - + public boolean applyHpMpChange(int hpCon, int hpchange, int mpchange) { boolean zombify = hasDisease(MapleDisease.ZOMBIFY); - + effLock.lock(); statWlock.lock(); try { @@ -9104,7 +9109,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.unlock(); effLock.unlock(); } - + // autopot on HPMP deplete... thanks shavit for finding out D. Roar doesn't trigger autopot request if (hpchange < 0) { KeyBinding autohpPot = this.getKeymap().get(91); @@ -9120,7 +9125,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + if (mpchange < 0) { KeyBinding autompPot = this.getKeymap().get(92); if (autompPot != null) { @@ -9135,10 +9140,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + return true; } - + public void setInventory(InventoryType type, Inventory inv) { inventory[type.ordinal()] = inv; } @@ -9162,11 +9167,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLevel(int level) { this.level = level; } - + public void setMap(int PmapId) { this.mapid = PmapId; } - + public void setMessenger(MapleMessenger messenger) { this.messenger = messenger; } @@ -9179,7 +9184,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.miniGame = miniGame; } - public void setMiniGamePoints(MapleCharacter visitor, int winnerslot, boolean omok) { + public void setMiniGamePoints(Character visitor, int winnerslot, boolean omok) { if (omok) { if (winnerslot == 1) { this.omokwins++; @@ -9212,11 +9217,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setName(String name) { this.name = name; } - + public void setRPS(MapleRockPaperScissor rps) { this.rps = rps; } - + public void closeRPS() { MapleRockPaperScissor rps = this.rps; if (rps != null) { @@ -9238,14 +9243,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public int getDoorSlot() { - if(doorSlot != -1) { + if (doorSlot != -1) { return doorSlot; } return fetchDoorSlot(); } - + public int fetchDoorSlot() { prtLock.lock(); try { @@ -9255,7 +9260,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public void setParty(MapleParty p) { prtLock.lock(); try { @@ -9275,7 +9280,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setPlayerShop(MaplePlayerShop playerShop) { this.playerShop = playerShop; } - + public void setSearch(String find) { search = find; } @@ -9287,12 +9292,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public byte getSlots(int type) { return type == InventoryType.CASH.getType() ? 96 : inventory[type].getSlotLimit(); } - + public boolean canGainSlots(int type, int slots) { slots += inventory[type].getSlotLimit(); return slots <= 96; } - + public boolean gainSlots(int type, int slots) { return gainSlots(type, slots, true); } @@ -9309,7 +9314,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + private int gainSlotsInternal(int type, int slots) { inventory[type].lockInventory(); try { @@ -9324,32 +9329,32 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inventory[type].unlockInventory(); } } - + public int sellAllItemsFromName(byte invTypeId, String name) { //player decides from which inventory items should be sold. InventoryType type = InventoryType.getByType(invTypeId); - + Inventory inv = getInventory(type); inv.lockInventory(); try { Item it = inv.findByName(name); - if(it == null) { - return(-1); + if (it == null) { + return (-1); } - return(sellAllItemsFromPosition(ii, type, it.getPosition())); + return (sellAllItemsFromPosition(ii, type, it.getPosition())); } finally { inv.unlockInventory(); } } - + public int sellAllItemsFromPosition(MapleItemInformationProvider ii, InventoryType type, short pos) { int mesoGain = 0; - + Inventory inv = getInventory(type); inv.lockInventory(); try { - for(short i = pos; i <= inv.getSlotLimit(); i++) { + for (short i = pos; i <= inv.getSlotLimit(); i++) { if (inv.getItem(i) == null) { continue; } @@ -9358,32 +9363,32 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { inv.unlockInventory(); } - - return(mesoGain); + + return (mesoGain); } private int standaloneSell(MapleClient c, MapleItemInformationProvider ii, InventoryType type, short slot, short quantity) { if (quantity == 0xFFFF || quantity == 0) { quantity = 1; } - + Inventory inv = getInventory(type); inv.lockInventory(); try { - Item item = inv.getItem((short) slot); - if (item == null){ //Basic check - return(0); + Item item = inv.getItem(slot); + if (item == null) { //Basic check + return (0); } int itemid = item.getItemId(); if (ItemConstants.isRechargeable(itemid)) { quantity = item.getQuantity(); } else if (ItemConstants.isWeddingToken(itemid) || ItemConstants.isWeddingRing(itemid)) { - return(0); + return (0); } if (quantity < 0) { - return(0); + return (0); } short iQuant = item.getQuantity(); if (iQuant == 0xFFFF) { @@ -9395,59 +9400,59 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int recvMesos = ii.getPrice(itemid, quantity); if (recvMesos > 0) { gainMeso(recvMesos, false); - return(recvMesos); + return (recvMesos); } } - return(0); + return (0); } finally { inv.unlockInventory(); } } - + private static boolean hasMergeFlag(Item item) { return (item.getFlag() & ItemConstants.MERGE_UNTRADEABLE) == ItemConstants.MERGE_UNTRADEABLE; } - + private static void setMergeFlag(Item item) { short flag = item.getFlag(); flag |= ItemConstants.MERGE_UNTRADEABLE; flag |= ItemConstants.UNTRADEABLE; item.setFlag(flag); } - + private List getUpgradeableEquipped() { List list = new LinkedList<>(); - + for (Item item : getInventory(InventoryType.EQUIPPED)) { if (ii.isUpgradeable(item.getItemId())) { list.add((Equip) item); } } - + return list; } - + private static List getEquipsWithStat(List>> equipped, StatUpgrade stat) { List equippedWithStat = new LinkedList<>(); - + for (Pair> eq : equipped) { if (eq.getRight().containsKey(stat)) { equippedWithStat.add(eq.getLeft()); } } - + return equippedWithStat; } - + public boolean mergeAllItemsFromName(String name) { InventoryType type = InventoryType.EQUIP; - + Inventory inv = getInventory(type); inv.lockInventory(); try { Item it = inv.findByName(name); - if(it == null) { + if (it == null) { return false; } @@ -9472,7 +9477,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Set extraEquipped = new LinkedHashSet<>(equipUpgrades.keySet()); List statEquipped = getEquipsWithStat(upgradeableEquipped, e.getKey()); - float extraRate = (float)(0.2 * Math.random()); + float extraRate = (float) (0.2 * Math.random()); if (!statEquipped.isEmpty()) { float statRate = 1.0f - extraRate; @@ -9510,18 +9515,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dropMessage(6, showStr); } } - + return true; } finally { inv.unlockInventory(); } } - + public void mergeAllItemsFromPosition(Map statups, short pos) { Inventory inv = getInventory(InventoryType.EQUIP); inv.lockInventory(); try { - for(short i = pos; i <= inv.getSlotLimit(); i++) { + for (short i = pos; i <= inv.getSlotLimit(); i++) { standaloneMerge(statups, getClient(), InventoryType.EQUIP, i, inv.getItem(i)); } } finally { @@ -9531,14 +9536,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void standaloneMerge(Map statups, MapleClient c, InventoryType type, short slot, Item item) { short quantity; - if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)){ + if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)) { return; } - + Equip e = (Equip) item; for (Entry s : e.getStats().entrySet()) { Float newVal = statups.get(s.getKey()); - + float incVal = s.getValue().floatValue(); switch (s.getKey()) { case incPAD: @@ -9548,19 +9553,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { incVal = (float) Math.log(incVal); break; } - + if (newVal != null) { newVal += incVal; } else { newVal = incVal; } - + statups.put(s.getKey(), newVal); } - + InventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); } - + public void setShop(MapleShop shop) { this.shop = shop; } @@ -9568,7 +9573,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setSlot(int slotid) { slots = slotid; } - + public void setTrade(MapleTrade trade) { this.trade = trade; } @@ -9601,47 +9606,47 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private long getDojoTimeLeft() { return client.getChannelServer().getDojoFinishTime(map.getId()) - Server.getInstance().getCurrentTime(); } - + public void showDojoClock() { if (GameConstants.isDojoBossArea(map.getId())) { sendPacket(PacketCreator.getClock((int) (getDojoTimeLeft() / 1000))); } } - + public void showUnderleveledInfo(MapleMonster mob) { long curTime = Server.getInstance().getCurrentTime(); - if(nextWarningTime < curTime) { + if (nextWarningTime < curTime) { nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute - + showHint("You have gained #rno experience#k from defeating #e#b" + mob.getName() + "#k#n (lv. #b" + mob.getLevel() + "#k)! Take note you must have around the same level as the mob to start earning EXP from it."); } } - - public void showMapOwnershipInfo(MapleCharacter mapOwner) { + + public void showMapOwnershipInfo(Character mapOwner) { long curTime = Server.getInstance().getCurrentTime(); - if(nextWarningTime < curTime) { + if (nextWarningTime < curTime) { nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute - + String medal = ""; Item medalItem = mapOwner.getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medalItem != null) { medal = "<" + ii.getName(medalItem.getItemId()) + "> "; } - + List strLines = new LinkedList<>(); strLines.add(""); strLines.add(""); strLines.add(""); strLines.add(this.getClient().getChannelServer().getServerMessage().isEmpty() ? 0 : 1, "Get off my lawn!!"); - + this.sendPacket(PacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true)); } } - + public void showHint(String msg) { showHint(msg, 500); } - + public void showHint(String msg, int length) { client.announceHint(msg, length); } @@ -9671,7 +9676,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void silentPartyUpdate() { silentPartyUpdateInternal(getParty()); } - + private void silentPartyUpdateInternal(MapleParty chrParty) { if (chrParty != null) { getWorldServer().updateParty(chrParty.getId(), PartyOperation.SILENT_UPDATE, getMPC()); @@ -9712,7 +9717,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pet == null) { return; } - + int newFullness = pet.getFullness() - PetDataFactory.getHunger(pet.getItemId()); if (newFullness <= 5) { pet.setFullness(15); @@ -9728,11 +9733,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public boolean runTirednessSchedule() { - if(maplemount != null) { + if (maplemount != null) { int tiredness = maplemount.incrementAndGetTiredness(); - + this.getMap().broadcastMessage(PacketCreator.updateMount(this.getId(), maplemount, false)); if (tiredness > 99) { maplemount.setTiredness(99); @@ -9741,7 +9746,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + return true; } @@ -9759,7 +9764,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, duration); } - + public void unequipAllPets() { for (int i = 0; i < 3; i++) { Pet pet = getPet(i); @@ -9776,18 +9781,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void unequipPet(Pet pet, boolean shift_left, boolean hunger) { byte petIdx = this.getPetIndex(pet); Pet chrPet = this.getPet(petIdx); - + if (chrPet != null) { chrPet.setSummoned(false); chrPet.saveToDb(); } - + this.getClient().getWorldServer().unregisterPetHunger(this, petIdx); getMap().broadcastMessage(this, PacketCreator.showPet(this, pet, true, hunger), true); - + removePet(pet, shift_left); commitExcludedItems(); - + sendPacket(PacketCreator.petStatUpdate(this)); sendPacket(PacketCreator.enableActions()); } @@ -9804,21 +9809,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + private void updatePartyMemberHPInternal() { if (party != null) { int curmaxhp = getCurrentMaxHp(); int curhp = getHp(); - for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { + for (Character partychar : this.getPartyMembersOnSameMap()) { partychar.sendPacket(PacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp)); } } } - + public void setQuestProgress(int id, int infoNumber, String progress) { MapleQuest q = MapleQuest.getInstance(id); MapleQuestStatus qs = getQuest(q); - + if (qs.getInfoNumber() == infoNumber && infoNumber > 0) { MapleQuest iq = MapleQuest.getInstance(infoNumber); MapleQuestStatus iqs = getQuest(iq); @@ -9832,52 +9837,52 @@ public class MapleCharacter extends AbstractMapleCharacterObject { announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, true); } } - + public void awardQuestPoint(int awardedPoints) { if (YamlConfig.config.server.QUEST_POINT_REQUIREMENT < 1 || awardedPoints < 1) { return; } - + int delta; synchronized (quests) { quest_fame += awardedPoints; - + delta = quest_fame / YamlConfig.config.server.QUEST_POINT_REQUIREMENT; quest_fame %= YamlConfig.config.server.QUEST_POINT_REQUIREMENT; } - - if(delta > 0) { + + if (delta > 0) { gainFame(delta); } } - + public enum DelayedQuestUpdate { // quest updates allow player actions during NPC talk... UPDATE, FORFEIT, COMPLETE, INFO } - - private void announceUpdateQuestInternal(MapleCharacter chr, Pair questUpdate) { + + private void announceUpdateQuestInternal(Character chr, Pair questUpdate) { Object[] objs = questUpdate.getRight(); - + switch (questUpdate.getLeft()) { case UPDATE: sendPacket(PacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1])); break; - + case FORFEIT: sendPacket(PacketCreator.forfeitQuest((Short) objs[0])); break; - + case COMPLETE: sendPacket(PacketCreator.completeQuest((Short) objs[0], (Long) objs[1])); break; - + case INFO: MapleQuestStatus qs = (MapleQuestStatus) objs[0]; sendPacket(PacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc())); break; } } - + public void announceUpdateQuest(DelayedQuestUpdate questUpdateType, Object... params) { Pair p = new Pair<>(questUpdateType, params); MapleClient c = this.getClient(); @@ -9889,20 +9894,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { announceUpdateQuestInternal(this, p); } } - + public void flushDelayedUpdateQuests() { List> qmQuestUpdateList; - + synchronized (npcUpdateQuests) { qmQuestUpdateList = new ArrayList<>(npcUpdateQuests); npcUpdateQuests.clear(); } - + for (Pair q : qmQuestUpdateList) { announceUpdateQuestInternal(this, q); } } - + public void updateQuestStatus(MapleQuestStatus qs) { synchronized (quests) { quests.put(qs.getQuestID(), qs); @@ -9931,13 +9936,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { // reminder: do not reset quest progress of infoNumbers, some quests cannot backtrack } } - + private void expireQuest(MapleQuest quest) { if (quest.forfeit(this)) { sendPacket(PacketCreator.questExpire(quest.getId())); } } - + public void cancelQuestExpirationTask() { evtLock.lock(); try { @@ -9949,25 +9954,25 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + public void forfeitExpirableQuests() { evtLock.lock(); try { - for(MapleQuest quest : questExpirations.keySet()) { + for (MapleQuest quest : questExpirations.keySet()) { quest.forfeit(this); } - + questExpirations.clear(); } finally { evtLock.unlock(); } } - + public void questExpirationTask() { evtLock.lock(); try { - if(!questExpirations.isEmpty()) { - if(questExpireTask == null) { + if (!questExpirations.isEmpty()) { + if (questExpireTask == null) { questExpireTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -9980,26 +9985,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + private void runQuestExpireTask() { evtLock.lock(); try { long timeNow = Server.getInstance().getCurrentTime(); List expireList = new LinkedList<>(); - - for(Entry qe : questExpirations.entrySet()) { - if(qe.getValue() <= timeNow) { + + for (Entry qe : questExpirations.entrySet()) { + if (qe.getValue() <= timeNow) { expireList.add(qe.getKey()); } } - - if(!expireList.isEmpty()) { - for(MapleQuest quest : expireList) { + + if (!expireList.isEmpty()) { + for (MapleQuest quest : expireList) { expireQuest(quest); questExpirations.remove(quest); } - - if(questExpirations.isEmpty()) { + + if (questExpirations.isEmpty()) { questExpireTask.cancel(false); questExpireTask = null; } @@ -10008,11 +10013,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + private void registerQuestExpire(MapleQuest quest, long time) { evtLock.lock(); try { - if(questExpireTask == null) { + if (questExpireTask == null) { questExpireTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -10020,22 +10025,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, 10 * 1000); } - + questExpirations.put(quest, Server.getInstance().getCurrentTime() + time); } finally { evtLock.unlock(); } } - + public void questTimeLimit(final MapleQuest quest, int seconds) { registerQuestExpire(quest, seconds * 1000); sendPacket(PacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000)); } - + public void questTimeLimit2(final MapleQuest quest, long expires) { long timeLeft = expires - System.currentTimeMillis(); - - if(timeLeft <= 0) { + + if (timeLeft <= 0) { expireQuest(quest); } else { registerQuestExpire(quest, timeLeft); @@ -10073,7 +10078,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendSpawnData(MapleClient client) { if (!this.isHidden() || client.getPlayer().gmLevel() > 1) { client.sendPacket(PacketCreator.spawnPlayerMapObject(client, this, false)); - + if (buffEffects.containsKey(getJobMapChair(job))) { // mustn't effLock, chrLock sendSpawnData client.sendPacket(PacketCreator.giveForeignChairSkillEffect(id)); } @@ -10104,37 +10109,37 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public CashShop getCashShop() { return cashshop; } - + public Set getNewYearRecords() { return newyears; } - + public Set getReceivedNewYearRecords() { Set received = new LinkedHashSet<>(); - - for(NewYearCardRecord nyc : newyears) { - if(nyc.isReceiverCardReceived()) { + + for (NewYearCardRecord nyc : newyears) { + if (nyc.isReceiverCardReceived()) { received.add(nyc); } } - + return received; } - + public NewYearCardRecord getNewYearRecord(int cardid) { - for(NewYearCardRecord nyc : newyears) { - if(nyc.getId() == cardid) { + for (NewYearCardRecord nyc : newyears) { + if (nyc.getId() == cardid) { return nyc; } } - + return null; } - + public void addNewYearRecord(NewYearCardRecord newyear) { newyears.add(newyear); } - + public void removeNewYearRecord(NewYearCardRecord newyear) { newyears.remove(newyear); } @@ -10186,10 +10191,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void autoban(String reason) { - if (this.isGM() || this.isBanned()){ // thanks RedHat for noticing GM's being able to get banned + if (this.isGM() || this.isBanned()) { // thanks RedHat for noticing GM's being able to get banned return; } - + this.ban(reason); sendPacket(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic"))); TimerManager.getInstance().schedule(new Runnable() { @@ -10198,8 +10203,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { client.disconnect(false, false); } }, 5000); - - Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason)); + + Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, Character.makeMapleReadable(this.name) + " was autobanned for " + reason)); } public void block(int reason, int days, String desc) { @@ -10256,11 +10261,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean isTrockMap(int id) { int index = trockmaps.indexOf(id); - if (index != -1) { - return true; - } - - return false; + return index != -1; } public int getVipTrockSize() { @@ -10289,20 +10290,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean isVipTrockMap(int id) { int index = viptrockmaps.indexOf(id); - if (index != -1) { - return true; - } - - return false; + return index != -1; } - + public AutobanManager getAutobanManager() { return autoban; } - + public void equippedItem(Equip equip) { int itemid = equip.getItemId(); - + if (itemid == 1122017) { this.equipPendantOfSpirit(); } else if (itemid == 1812000) { // meso magnet @@ -10313,10 +10310,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equippedPetItemIgnore = true; } } - + public void unequippedItem(Equip equip) { int itemid = equip.getItemId(); - + if (itemid == 1122017) { this.unequipPendantOfSpirit(); } else if (itemid == 1812000) { // meso magnet @@ -10327,19 +10324,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equippedPetItemIgnore = false; } } - + public boolean isEquippedMesoMagnet() { return equippedMesoMagnet; } - + public boolean isEquippedItemPouch() { return equippedItemPouch; } - + public boolean isEquippedPetItemIgnore() { return equippedPetItemIgnore; } - + private void equipPendantOfSpirit() { if (pendantOfSpirit == null) { pendantOfSpirit = TimerManager.getInstance().register(new Runnable() { @@ -10363,13 +10360,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } pendantExp = 0; } - + private Collection getUpgradeableEquipList() { Collection fullList = getInventory(InventoryType.EQUIPPED).list(); if (YamlConfig.config.server.USE_EQUIPMNT_LVLUP_CASH) { return fullList; } - + Collection eqpList = new LinkedHashSet<>(); for (Item it : fullList) { if (!ii.isCash(it.getItemId())) { @@ -10379,10 +10376,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return eqpList; } - + public void increaseEquipExp(int expGain) { if (allowExpGain) { // thanks Vcoc for suggesting equip EXP gain conditionally - if(expGain < 0) { + if (expGain < 0) { expGain = Integer.MAX_VALUE; } @@ -10397,33 +10394,33 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void showAllEquipFeatures() { String showMsg = ""; - + for (Item item : getInventory(InventoryType.EQUIPPED).list()) { Equip nEquip = (Equip) item; String itemName = ii.getName(nEquip.getItemId()); if (itemName == null) { continue; } - + showMsg += nEquip.showEquipFeatures(client); } - - if(!showMsg.isEmpty()) { + + if (!showMsg.isEmpty()) { this.showHint("#ePLAYER EQUIPMENTS:#n\r\n\r\n" + showMsg, 400); } } - + public void broadcastMarriageMessage() { MapleGuild guild = this.getGuild(); - if(guild != null) { + if (guild != null) { guild.broadcast(PacketCreator.marriageMessage(0, name)); } - + MapleFamily family = this.getFamily(); - if(family != null) { + if (family != null) { family.broadcast(PacketCreator.marriageMessage(1, name)); } } @@ -10443,26 +10440,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setCpqTimer(ScheduledFuture timer) { this.cpqSchedule = timer; } - + public void clearCpqTimer() { - if (cpqSchedule != null) { cpqSchedule.cancel(true); } + if (cpqSchedule != null) { + cpqSchedule.cancel(true); + } cpqSchedule = null; } - + public final void empty(final boolean remove) { - if (dragonBloodSchedule != null) { dragonBloodSchedule.cancel(true); } + if (dragonBloodSchedule != null) { + dragonBloodSchedule.cancel(true); + } dragonBloodSchedule = null; - if (hpDecreaseTask != null) { hpDecreaseTask.cancel(true); } + if (hpDecreaseTask != null) { + hpDecreaseTask.cancel(true); + } hpDecreaseTask = null; - if (beholderHealingSchedule != null) { beholderHealingSchedule.cancel(true); } + if (beholderHealingSchedule != null) { + beholderHealingSchedule.cancel(true); + } beholderHealingSchedule = null; - if (beholderBuffSchedule != null) { beholderBuffSchedule.cancel(true); } + if (beholderBuffSchedule != null) { + beholderBuffSchedule.cancel(true); + } beholderBuffSchedule = null; - if (berserkSchedule != null) { berserkSchedule.cancel(true); } + if (berserkSchedule != null) { + berserkSchedule.cancel(true); + } berserkSchedule = null; unregisterChairBuff(); @@ -10471,37 +10480,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelSkillCooldownTask(); cancelExpirationTask(); - if (questExpireTask != null) { questExpireTask.cancel(true); } + if (questExpireTask != null) { + questExpireTask.cancel(true); + } questExpireTask = null; - if (recoveryTask != null) { recoveryTask.cancel(true); } + if (recoveryTask != null) { + recoveryTask.cancel(true); + } recoveryTask = null; - if (extraRecoveryTask != null) { extraRecoveryTask.cancel(true); } + if (extraRecoveryTask != null) { + extraRecoveryTask.cancel(true); + } extraRecoveryTask = null; // already done on unregisterChairBuff /* if (chairRecoveryTask != null) { chairRecoveryTask.cancel(true); } chairRecoveryTask = null; */ - if (pendantOfSpirit != null) { pendantOfSpirit.cancel(true); } + if (pendantOfSpirit != null) { + pendantOfSpirit.cancel(true); + } pendantOfSpirit = null; - + clearCpqTimer(); - + evtLock.lock(); try { if (questExpireTask != null) { questExpireTask.cancel(false); questExpireTask = null; - + questExpirations.clear(); questExpirations = null; } } finally { evtLock.unlock(); } - + if (maplemount != null) { maplemount.empty(); maplemount = null; @@ -10513,18 +10530,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { mgc = null; party = null; MapleFamilyEntry familyEntry = getFamilyEntry(); - if(familyEntry != null) { + if (familyEntry != null) { familyEntry.setCharacter(null); setFamilyEntry(null); } - + getWorldServer().registerTimedMapObject(new Runnable() { @Override public void run() { client = null; // clients still triggers handlers a few times after disconnecting map = null; setListener(null); - + // thanks Shavit for noticing a memory leak with inventories holding owner object for (int i = 0; i < inventory.length; i++) { inventory[i].dispose(); @@ -10547,15 +10564,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public void setLoginTime(long time) { this.loginTime = time; } - + public long getLoginTime() { return loginTime; } - + public long getLoggedInTime() { return System.currentTimeMillis() - loginTime; } @@ -10569,7 +10586,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public boolean getWhiteChat() { - return !isGM() ? false : whiteChat; + return isGM() && whiteChat; } public void toggleWhiteChat() { @@ -10608,45 +10625,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setDragon(MapleDragon dragon) { this.dragon = dragon; } - + public void setAutopotHpAlert(float hpPortion) { autopotHpAlert = hpPortion; } - + public float getAutopotHpAlert() { return autopotHpAlert; } - + public void setAutopotMpAlert(float mpPortion) { autopotMpAlert = mpPortion; } - + public float getAutopotMpAlert() { return autopotMpAlert; } - + public long getJailExpirationTimeLeft() { return jailExpiration - System.currentTimeMillis(); } - + private void setFutureJailExpiration(long time) { jailExpiration = System.currentTimeMillis() + time; } - + public void addJailExpirationTime(long time) { long timeLeft = getJailExpirationTimeLeft(); - if(timeLeft <= 0) { + if (timeLeft <= 0) { setFutureJailExpiration(time); } else { setFutureJailExpiration(timeLeft + time); } } - + public void removeJailExpirationTime() { jailExpiration = 0; } - + public boolean registerNameChange(String newName) { try (Connection con = DatabaseConnection.getConnection()) { //check for pending name change @@ -10703,7 +10720,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public void doPendingNameChange() { //called on logout if (!pendingNameChange) { return; @@ -10731,7 +10748,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!success) { con.rollback(); } else { - FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime().toString()); + FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime()); } con.setAutoCommit(true); } catch (SQLException e) { @@ -10739,7 +10756,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e, "Failed to get DB connection."); } } - + public static void doNameChange(int characterId, String oldName, String newName, int nameChangeId) { //Don't do this while player is online try (Connection con = DatabaseConnection.getConnection()) { con.setAutoCommit(false); @@ -10753,7 +10770,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e, "Failed to get DB connection."); } } - + public static boolean doNameChange(Connection con, int characterId, String oldName, String newName, int nameChangeId) { try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET name = ? WHERE id = ?")) { ps.setString(1, newName); @@ -10897,36 +10914,48 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return true; } - + public int checkWorldTransferEligibility() { - if(getLevel() < 20) { + if (getLevel() < 20) { return 2; - } else if(getClient().getTempBanCalendar() != null && getClient().getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) < Calendar.getInstance().getTimeInMillis()) { + } else if (getClient().getTempBanCalendar() != null && getClient().getTempBanCalendar().getTimeInMillis() + (30 * 24 * 60 * 60 * 1000) < Calendar.getInstance().getTimeInMillis()) { return 3; - } else if(isMarried()) { + } else if (isMarried()) { return 4; - } else if(getGuildRank() < 2) { + } else if (getGuildRank() < 2) { return 5; - } else if(getFamily() != null) { + } else if (getFamily() != null) { return 8; } else { return 0; } } - + public static String checkWorldTransferEligibility(Connection con, int characterId, int oldWorld, int newWorld) { - if(!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) return "World transfers disabled."; + if (!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) { + return "World transfers disabled."; + } int accountId = -1; try (PreparedStatement ps = con.prepareStatement("SELECT accountid, level, guildid, guildrank, partnerId, familyId FROM characters WHERE id = ?")) { ps.setInt(1, characterId); ResultSet rs = ps.executeQuery(); - if(!rs.next()) return "Character does not exist."; + if (!rs.next()) { + return "Character does not exist."; + } accountId = rs.getInt("accountid"); - if(rs.getInt("level") < 20) return "Character is under level 20."; - if(rs.getInt("familyId") != -1) return "Character is in family."; - if(rs.getInt("partnerId") != 0) return "Character is married."; - if(rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) return "Character is the leader of a guild."; - } catch(SQLException e) { + if (rs.getInt("level") < 20) { + return "Character is under level 20."; + } + if (rs.getInt("familyId") != -1) { + return "Character is in family."; + } + if (rs.getInt("partnerId") != 0) { + return "Character is married."; + } + if (rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) { + return "Character is the leader of a guild."; + } + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; @@ -10938,10 +10967,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return "Account does not exist."; } LocalDateTime tempban = rs.getTimestamp("tempban").toLocalDateTime(); - if(!tempban.equals(DefaultDates.getTempban())) { + if (!tempban.equals(DefaultDates.getTempban())) { return "Account has been banned."; } - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; @@ -10950,16 +10979,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, accountId); ps.setInt(2, newWorld); ResultSet rs = ps.executeQuery(); - if(!rs.next()) return "SQL Error"; - if(rs.getInt("rowcount") >= 3) return "Too many characters on destination world."; - } catch(SQLException e) { + if (!rs.next()) { + return "SQL Error"; + } + if (rs.getInt("rowcount") >= 3) { + return "Too many characters on destination world."; + } + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; } return null; } - + public boolean registerWorldTransfer(int newWorld) { try (Connection con = DatabaseConnection.getConnection()) { //check for pending world transfer @@ -10997,7 +11030,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public boolean cancelPendingWorldTranfer() { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM worldtransfers WHERE characterid=? AND completionTime IS NULL")) { @@ -11010,18 +11043,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public static boolean doWorldTransfer(Connection con, int characterId, int oldWorld, int newWorld, int worldTransferId) { int mesos = 0; try (PreparedStatement ps = con.prepareStatement("SELECT meso FROM characters WHERE id = ?")) { ps.setInt(1, characterId); ResultSet rs = ps.executeQuery(); - if(!rs.next()) { + if (!rs.next()) { FilePrinter.printError(FilePrinter.WORLD_TRANSFER, "Character data invalid? (charid " + characterId + ")"); return false; } mesos = rs.getInt("meso"); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11033,7 +11066,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(4, 5); ps.setInt(5, characterId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11042,17 +11075,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, characterId); ps.setInt(2, characterId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; } - if(worldTransferId != -1) { + if (worldTransferId != -1) { try (PreparedStatement ps = con.prepareStatement("UPDATE worldtransfers SET completionTime = ? WHERE id = ?")) { ps.setTimestamp(1, new Timestamp(System.currentTimeMillis())); ps.setInt(2, worldTransferId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11060,11 +11093,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return true; } - + public String getLastCommandMessage() { return this.commandtext; } - + public void setLastCommandMessage(String text) { this.commandtext = text; } @@ -11149,13 +11182,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { setLevel(0); levelUp(true); } - + //EVENTS private byte team = 0; private MapleFitness fitness; private MapleOla ola; private long snowballattack; - + public byte getTeam() { return team; } @@ -11187,19 +11220,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLastSnowballAttack(long time) { this.snowballattack = time; } - + // MCPQ - + public AriantColiseum ariantColiseum; private MonsterCarnival monsterCarnival; private MonsterCarnivalParty monsterCarnivalParty = null; - + private int cp = 0; private int totCP = 0; private int FestivalPoints; private boolean challenged = false; public short totalCP, availableCP; - + public void gainFestivalPoints(int gain) { this.FestivalPoints += gain; } @@ -11277,7 +11310,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setMonsterCarnival(MonsterCarnival monsterCarnival) { this.monsterCarnival = monsterCarnival; } - + public AriantColiseum getAriantColiseum() { return ariantColiseum; } @@ -11285,11 +11318,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setAriantColiseum(AriantColiseum ariantColiseum) { this.ariantColiseum = ariantColiseum; } - + public MonsterCarnivalParty getMonsterCarnivalParty() { return this.monsterCarnivalParty; } - + public void setMonsterCarnivalParty(MonsterCarnivalParty mcp) { this.monsterCarnivalParty = mcp; } @@ -11301,11 +11334,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setChallenged(boolean challenged) { this.challenged = challenged; } - + public void gainAriantPoints(int points) { this.ariantPoints += points; } - + public int getAriantPoints() { return this.ariantPoints; } diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index a6846a955e..53652d7ff1 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -94,7 +94,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { private volatile boolean inTransition; private io.netty.channel.Channel ioChannel; - private MapleCharacter player; + private Character player; private int channel = 1; private int accId = -4; private boolean loggedIn = false; @@ -288,11 +288,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter { return getChannelServer().getEventSM().getEventManager(event); } - public MapleCharacter getPlayer() { + public Character getPlayer() { return player; } - public void setPlayer(MapleCharacter player) { + public void setPlayer(Character player) { this.player = player; } @@ -304,11 +304,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter { this.sendPacket(PacketCreator.getCharList(this, server, 0)); } - public List loadCharacters(int serverId) { - List chars = new ArrayList<>(15); + public List loadCharacters(int serverId) { + List chars = new ArrayList<>(15); try { for (CharNameAndId cni : loadCharactersInternal(serverId)) { - chars.add(MapleCharacter.loadCharFromDB(cni.id, this, false)); + chars.add(Character.loadCharFromDB(cni.id, this, false)); } } catch (Exception e) { e.printStackTrace(); @@ -1091,7 +1091,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { public boolean deleteCharacter(int cid, int senderAccId) { try { - MapleCharacter chr = MapleCharacter.loadCharFromDB(cid, this, false); + Character chr = Character.loadCharFromDB(cid, this, false); Integer partyid = chr.getWorldServer().getCharacterPartyid(cid); if (partyid != null) { @@ -1105,7 +1105,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { this.setPlayer(null); } - return MapleCharacter.deleteCharFromDB(chr, senderAccId); + return Character.deleteCharFromDB(chr, senderAccId); } catch (SQLException ex) { ex.printStackTrace(); return false; @@ -1221,7 +1221,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } for (World w : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : w.getPlayerStorage().getAllCharacters()) { + for (Character chr : w.getPlayerStorage().getAllCharacters()) { if (accid == chr.getAccountID()) { FilePrinter.print(FilePrinter.EXPLOITS, "Player: " + chr.getName() + " has been removed from " + GameConstants.WORLD_NAMES[w.getId()] + ". Possible Dupe attempt."); chr.getClient().forceDisconnect(); diff --git a/src/main/java/client/MapleFamily.java b/src/main/java/client/MapleFamily.java index b0a295f5b4..9a7ec6d21c 100644 --- a/src/main/java/client/MapleFamily.java +++ b/src/main/java/client/MapleFamily.java @@ -158,7 +158,7 @@ public class MapleFamily { public void broadcast(Packet packet, int ignoreID) { for(MapleFamilyEntry entry : members.values()) { - MapleCharacter chr = entry.getChr(); + Character chr = entry.getChr(); if(chr != null) { if(chr.getId() == ignoreID) continue; chr.sendPacket(packet); @@ -168,7 +168,7 @@ public class MapleFamily { public void broadcastFamilyInfoUpdate() { for(MapleFamilyEntry entry : members.values()) { - MapleCharacter chr = entry.getChr(); + Character chr = entry.getChr(); if(chr != null) { chr.sendPacket(PacketCreator.getFamilyInfo(entry)); } diff --git a/src/main/java/client/MapleFamilyEntry.java b/src/main/java/client/MapleFamilyEntry.java index f42cf3d540..cd8c032d85 100644 --- a/src/main/java/client/MapleFamilyEntry.java +++ b/src/main/java/client/MapleFamilyEntry.java @@ -40,7 +40,7 @@ import java.util.List; public class MapleFamilyEntry { private final int characterID; private volatile MapleFamily family; - private volatile MapleCharacter character; + private volatile Character character; private volatile MapleFamilyEntry senior; private final MapleFamilyEntry[] juniors = new MapleFamilyEntry[2]; @@ -66,17 +66,17 @@ public class MapleFamilyEntry { this.job = job; } - public MapleCharacter getChr() { + public Character getChr() { return character; } - public void setCharacter(MapleCharacter newCharacter) { + public void setCharacter(Character newCharacter) { if(newCharacter == null) cacheOffline(newCharacter); else newCharacter.setFamilyEntry(this); this.character = newCharacter; } - private void cacheOffline(MapleCharacter chr) { + private void cacheOffline(Character chr) { if(chr != null) { charName = chr.getName(); level = chr.getLevel(); @@ -209,19 +209,19 @@ public class MapleFamilyEntry { } public String getName() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getName(); else return charName; } public int getLevel() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getLevel(); else return level; } public MapleJob getJob() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getJob(); else return job; } @@ -264,7 +264,7 @@ public class MapleFamilyEntry { if(gain > 0 && countTowardsTotal) { this.totalReputation += gain; } - MapleCharacter chr = getChr(); + Character chr = getChr(); if(chr != null) chr.sendPacket(PacketCreator.sendGainRep(gain, from != null ? from.getName() : "")); } @@ -424,7 +424,7 @@ public class MapleFamilyEntry { public void announceToSenior(Packet packet, boolean includeSuperSenior) { MapleFamilyEntry senior = getSenior(); if(senior != null) { - MapleCharacter seniorChr = senior.getChr(); + Character seniorChr = senior.getChr(); if(seniorChr != null) seniorChr.sendPacket(packet); senior = senior.getSenior(); if(includeSuperSenior && senior != null) { @@ -437,7 +437,7 @@ public class MapleFamilyEntry { public void updateSeniorFamilyInfo(boolean includeSuperSenior) { MapleFamilyEntry senior = getSenior(); if(senior != null) { - MapleCharacter seniorChr = senior.getChr(); + Character seniorChr = senior.getChr(); if(seniorChr != null) seniorChr.sendPacket(PacketCreator.getFamilyInfo(senior)); senior = senior.getSenior(); if(includeSuperSenior && senior != null) { diff --git a/src/main/java/client/MapleMount.java b/src/main/java/client/MapleMount.java index 242b711a7c..020eef4f26 100644 --- a/src/main/java/client/MapleMount.java +++ b/src/main/java/client/MapleMount.java @@ -30,10 +30,10 @@ public class MapleMount { private int tiredness; private int exp; private int level; - private MapleCharacter owner; + private Character owner; private boolean active; - public MapleMount(MapleCharacter owner, int id, int skillid) { + public MapleMount(Character owner, int id, int skillid) { this.itemid = id; this.skillid = skillid; this.tiredness = 0; diff --git a/src/main/java/client/MapleRing.java b/src/main/java/client/MapleRing.java index 0a5f921e6a..6565fc9e9a 100644 --- a/src/main/java/client/MapleRing.java +++ b/src/main/java/client/MapleRing.java @@ -103,7 +103,7 @@ public class MapleRing implements Comparable { } } - public static Pair createRing(int itemid, final MapleCharacter partner1, final MapleCharacter partner2) { + public static Pair createRing(int itemid, final Character partner1, final Character partner2) { try { if (partner1 == null) { return new Pair<>(-3, -3); diff --git a/src/main/java/client/autoban/AutobanFactory.java b/src/main/java/client/autoban/AutobanFactory.java index 481a7a0ee4..2fba4249a7 100644 --- a/src/main/java/client/autoban/AutobanFactory.java +++ b/src/main/java/client/autoban/AutobanFactory.java @@ -22,7 +22,7 @@ along with this program. If not, see . package client.autoban; -import client.MapleCharacter; +import client.Character; import config.YamlConfig; import net.packet.logging.MapleLogger; import net.server.Server; @@ -83,19 +83,19 @@ public enum AutobanFactory { ban.addPoint(this, reason); } - public void alert(MapleCharacter chr, String reason) { + public void alert(Character chr, String reason) { if(YamlConfig.config.server.USE_AUTOBAN == true) { if (chr != null && MapleLogger.ignored.contains(chr.getId())){ return; } - Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); + Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { - FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); + FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); } } - public void autoban(MapleCharacter chr, String value) { + public void autoban(Character chr, String value) { if(YamlConfig.config.server.USE_AUTOBAN == true) { chr.autoban("Autobanned for (" + this.name() + ": " + value + ")"); //chr.sendPolice("You will be disconnected for (" + this.name() + ": " + value + ")"); diff --git a/src/main/java/client/autoban/AutobanManager.java b/src/main/java/client/autoban/AutobanManager.java index e348fcfa29..1a3b782b20 100644 --- a/src/main/java/client/autoban/AutobanManager.java +++ b/src/main/java/client/autoban/AutobanManager.java @@ -5,7 +5,7 @@ package client.autoban; -import client.MapleCharacter; +import client.Character; import config.YamlConfig; import net.server.Server; import tools.FilePrinter; @@ -18,7 +18,7 @@ import java.util.Map; * @author kevintjuh93 */ public class AutobanManager { - private MapleCharacter chr; + private Character chr; private Map points = new HashMap<>(); private Map lastTime = new HashMap<>(); private int misses = 0; @@ -29,7 +29,7 @@ public class AutobanManager { private byte[] timestampcounter = new byte[20]; - public AutobanManager(MapleCharacter chr) { + public AutobanManager(Character chr) { this.chr = chr; } @@ -58,7 +58,7 @@ public class AutobanManager { } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { // Lets log every single point too. - FilePrinter.print(FilePrinter.AUTOBAN_WARNING, MapleCharacter.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason); + FilePrinter.print(FilePrinter.AUTOBAN_WARNING, Character.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason); } } diff --git a/src/main/java/client/command/commands/gm0/GmCommand.java b/src/main/java/client/command/commands/gm0/GmCommand.java index 9c2a94105f..b3f04324a2 100644 --- a/src/main/java/client/command/commands/gm0/GmCommand.java +++ b/src/main/java/client/command/commands/gm0/GmCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -45,15 +45,15 @@ public class GmCommand extends Command { "Do not ask if you can receive help, just state your issue.", "Do not say 'I have a bug to report', just state it.", }; - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1 || params[0].length() < 3) { // #goodbye 'hi' player.dropMessage(5, "Your message was too short. Please provide as much detail as possible."); return; } String message = player.getLastCommandMessage(); - Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + Character.makeMapleReadable(player.getName()) + ": " + message)); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message)); - FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message); + FilePrinter.printError(FilePrinter.COMMAND_GM, Character.makeMapleReadable(player.getName()) + ": " + message); player.dropMessage(5, "Your message '" + message + "' was sent to GMs."); player.dropMessage(5, tips[Randomizer.nextInt(tips.length)]); } diff --git a/src/main/java/client/command/commands/gm0/JoinEventCommand.java b/src/main/java/client/command/commands/gm0/JoinEventCommand.java index b0dc8e6be0..0f721272d4 100644 --- a/src/main/java/client/command/commands/gm0/JoinEventCommand.java +++ b/src/main/java/client/command/commands/gm0/JoinEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.events.gm.MapleEvent; @@ -36,7 +36,7 @@ public class JoinEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) { MapleEvent event = c.getChannelServer().getEvent(); if(event != null) { diff --git a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java index c8c5ef215d..721ed32829 100644 --- a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java +++ b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class LeaveEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int returnMap = player.getSavedLocation("EVENT"); if(returnMap != -1) { if(player.getOla() != null) { diff --git a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java index 18f74f02aa..0cabe6293c 100644 --- a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java +++ b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -38,7 +38,7 @@ public class MapOwnerClaimCommand extends Command { public void execute(MapleClient c, String[] params) { if (c.tryacquireClient()) { try { - MapleCharacter chr = c.getPlayer(); + Character chr = c.getPlayer(); if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) { if (chr.getEventInstance() == null) { diff --git a/src/main/java/client/command/commands/gm0/OnlineCommand.java b/src/main/java/client/command/commands/gm0/OnlineCommand.java index 683ac3e4ad..29edf19b47 100644 --- a/src/main/java/client/command/commands/gm0/OnlineCommand.java +++ b/src/main/java/client/command/commands/gm0/OnlineCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,12 +36,12 @@ public class OnlineCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) { player.yellowMessage("Players in Channel " + ch.getId() + ":"); - for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) { + for (Character chr : ch.getPlayerStorage().getAllCharacters()) { if (!chr.isGM()) { - player.message(" >> " + MapleCharacter.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + "."); + player.message(" >> " + Character.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + "."); } } } diff --git a/src/main/java/client/command/commands/gm0/RanksCommand.java b/src/main/java/client/command/commands/gm0/RanksCommand.java index 8e517fae34..23682f0f4a 100644 --- a/src/main/java/client/command/commands/gm0/RanksCommand.java +++ b/src/main/java/client/command/commands/gm0/RanksCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -39,7 +39,7 @@ public class RanksCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld()); player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking)); diff --git a/src/main/java/client/command/commands/gm0/RatesCommand.java b/src/main/java/client/command/commands/gm0/RatesCommand.java index 6052922a67..6764ff3a04 100644 --- a/src/main/java/client/command/commands/gm0/RatesCommand.java +++ b/src/main/java/client/command/commands/gm0/RatesCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class RatesCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); // travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n"; diff --git a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java b/src/main/java/client/command/commands/gm0/ReadPointsCommand.java index f05ab1666d..368790bcc0 100644 --- a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java +++ b/src/main/java/client/command/commands/gm0/ReadPointsCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -12,7 +12,7 @@ public class ReadPointsCommand extends Command { @Override public void execute(MapleClient client, String[] params) { - MapleCharacter player = client.getPlayer(); + Character player = client.getPlayer(); if (params.length > 2) { player.yellowMessage("Syntax: @points (rp|vp|all)"); return; diff --git a/src/main/java/client/command/commands/gm0/ReportBugCommand.java b/src/main/java/client/command/commands/gm0/ReportBugCommand.java index 7085dc730d..6ef44020bb 100644 --- a/src/main/java/client/command/commands/gm0/ReportBugCommand.java +++ b/src/main/java/client/command/commands/gm0/ReportBugCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,16 +37,16 @@ public class ReportBugCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Message too short and not sent. Please do @bug "); return; } String message = player.getLastCommandMessage(); - Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + Character.makeMapleReadable(player.getName()) + ": " + message)); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message)); - FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message); + FilePrinter.printError(FilePrinter.COMMAND_BUG, Character.makeMapleReadable(player.getName()) + ": " + message); player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!"); } diff --git a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java index 4ab627330b..953568b443 100644 --- a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java +++ b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class ShowRatesCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String showMsg = "#eEXP RATE#n" + "\r\n"; showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n"; showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n"; diff --git a/src/main/java/client/command/commands/gm0/StatDexCommand.java b/src/main/java/client/command/commands/gm0/StatDexCommand.java index fa93c26a8e..bdcc0130c9 100644 --- a/src/main/java/client/command/commands/gm0/StatDexCommand.java +++ b/src/main/java/client/command/commands/gm0/StatDexCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatDexCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatIntCommand.java b/src/main/java/client/command/commands/gm0/StatIntCommand.java index b40e4581ac..bb348728d8 100644 --- a/src/main/java/client/command/commands/gm0/StatIntCommand.java +++ b/src/main/java/client/command/commands/gm0/StatIntCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatIntCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatLukCommand.java b/src/main/java/client/command/commands/gm0/StatLukCommand.java index 4d7718eb89..d4c44f8462 100644 --- a/src/main/java/client/command/commands/gm0/StatLukCommand.java +++ b/src/main/java/client/command/commands/gm0/StatLukCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatLukCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatStrCommand.java b/src/main/java/client/command/commands/gm0/StatStrCommand.java index c83fdac3b4..34f548c51a 100644 --- a/src/main/java/client/command/commands/gm0/StatStrCommand.java +++ b/src/main/java/client/command/commands/gm0/StatStrCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatStrCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; if (params.length > 0) { diff --git a/src/main/java/client/command/commands/gm1/BossHpCommand.java b/src/main/java/client/command/commands/gm1/BossHpCommand.java index da24831dd1..5658a2164f 100644 --- a/src/main/java/client/command/commands/gm1/BossHpCommand.java +++ b/src/main/java/client/command/commands/gm1/BossHpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -35,7 +35,7 @@ public class BossHpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for(MapleMonster monster : player.getMap().getAllMonsters()) { if(monster != null && monster.isBoss() && monster.getHp() > 0) { long percent = monster.getHp() * 100L / monster.getMaxHp(); diff --git a/src/main/java/client/command/commands/gm1/BuffMeCommand.java b/src/main/java/client/command/commands/gm1/BuffMeCommand.java index ae9629d9e0..4223af3f39 100644 --- a/src/main/java/client/command/commands/gm1/BuffMeCommand.java +++ b/src/main/java/client/command/commands/gm1/BuffMeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class BuffMeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(4101004).getEffect(SkillFactory.getSkill(4101004).getMaxLevel()).applyTo(player); SkillFactory.getSkill(2311003).getEffect(SkillFactory.getSkill(2311003).getMaxLevel()).applyTo(player); SkillFactory.getSkill(1301007).getEffect(SkillFactory.getSkill(1301007).getMaxLevel()).applyTo(player); diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index 3568bd8250..587d062d71 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/src/main/java/client/command/commands/gm1/GotoCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -73,7 +73,7 @@ public class GotoCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ String sendStr = "Syntax: #b@goto #k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO; if (player.isGM()) { diff --git a/src/main/java/client/command/commands/gm1/MobHpCommand.java b/src/main/java/client/command/commands/gm1/MobHpCommand.java index 085cba6cd0..1b425f2c04 100644 --- a/src/main/java/client/command/commands/gm1/MobHpCommand.java +++ b/src/main/java/client/command/commands/gm1/MobHpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -35,7 +35,7 @@ public class MobHpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for(MapleMonster monster : player.getMap().getAllMonsters()) { if (monster != null && monster.getHp() > 0) { player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP."); diff --git a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java index 8b502268fc..0fdf15b24b 100644 --- a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java +++ b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.MapleItemInformationProvider; @@ -40,7 +40,7 @@ public class WhatDropsFromCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please do @whatdropsfrom "); return; diff --git a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java index c26c72acbf..782d9f4c1f 100644 --- a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java +++ b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.MapleItemInformationProvider; @@ -43,7 +43,7 @@ public class WhoDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please do @whodrops "); return; diff --git a/src/main/java/client/command/commands/gm2/ApCommand.java b/src/main/java/client/command/commands/gm2/ApCommand.java index d8891d6f3b..c44d19808a 100644 --- a/src/main/java/client/command/commands/gm2/ApCommand.java +++ b/src/main/java/client/command/commands/gm2/ApCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class ApCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !ap [] "); return; @@ -48,7 +48,7 @@ public class ApCommand extends Command { player.changeRemainingAp(newAp, false); } else { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int newAp = Integer.parseInt(params[1]); if (newAp < 0) newAp = 0; diff --git a/src/main/java/client/command/commands/gm2/BombCommand.java b/src/main/java/client/command/commands/gm2/BombCommand.java index 46d3f36f5a..345611d196 100644 --- a/src/main/java/client/command/commands/gm2/BombCommand.java +++ b/src/main/java/client/command/commands/gm2/BombCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,9 +37,9 @@ public class BombCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length > 0) { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), victim.getPosition()); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName())); diff --git a/src/main/java/client/command/commands/gm2/BuffCommand.java b/src/main/java/client/command/commands/gm2/BuffCommand.java index efd8fc97aa..424015015f 100644 --- a/src/main/java/client/command/commands/gm2/BuffCommand.java +++ b/src/main/java/client/command/commands/gm2/BuffCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.Skill; import client.SkillFactory; @@ -36,7 +36,7 @@ public class BuffCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !buff "); return; diff --git a/src/main/java/client/command/commands/gm2/BuffMapCommand.java b/src/main/java/client/command/commands/gm2/BuffMapCommand.java index 7cce5456d0..fdf9778817 100644 --- a/src/main/java/client/command/commands/gm2/BuffMapCommand.java +++ b/src/main/java/client/command/commands/gm2/BuffMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class BuffMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(player, true); SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(player, true); SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(player, true); diff --git a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java b/src/main/java/client/command/commands/gm2/ClearDropsCommand.java index d2c19b69ae..f7ffefafbe 100644 --- a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ClearDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().clearDrops(player); player.dropMessage(5, "Cleared dropped items"); } diff --git a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java index a6f152c50a..b3bc49632b 100644 --- a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.SavedLocationType; @@ -35,7 +35,7 @@ public class ClearSavedLocationsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(), victim; + Character player = c.getPlayer(), victim; if (params.length > 0) { victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index 13b354b427..f6ba53a872 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -37,7 +37,7 @@ public class ClearSlotCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !clearslot "); return; diff --git a/src/main/java/client/command/commands/gm2/DcCommand.java b/src/main/java/client/command/commands/gm2/DcCommand.java index ef333e9981..8725a2010c 100644 --- a/src/main/java/client/command/commands/gm2/DcCommand.java +++ b/src/main/java/client/command/commands/gm2/DcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class DcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !dc "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { diff --git a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java index a02c8dcfa3..beb40375c4 100644 --- a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java +++ b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class EmpowerMeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); final int[] array = {2311003, 2301004, 1301007, 4101004, 2001002, 1101007, 1005, 2301003, 5121009, 1111002, 4111001, 4111002, 4211003, 4211005, 1321000, 2321004, 3121002}; for (int i : array) { SkillFactory.getSkill(i).getEffect(SkillFactory.getSkill(i).getMaxLevel()).applyTo(player); diff --git a/src/main/java/client/command/commands/gm2/HealCommand.java b/src/main/java/client/command/commands/gm2/HealCommand.java index 71356dc5ff..1b71c8bc06 100644 --- a/src/main/java/client/command/commands/gm2/HealCommand.java +++ b/src/main/java/client/command/commands/gm2/HealCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class HealCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.healHpMp(); } diff --git a/src/main/java/client/command/commands/gm2/HideCommand.java b/src/main/java/client/command/commands/gm2/HideCommand.java index d806c97879..dcba586058 100644 --- a/src/main/java/client/command/commands/gm2/HideCommand.java +++ b/src/main/java/client/command/commands/gm2/HideCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class HideCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player); } diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index d37d84f4a8..231e12ae13 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/src/main/java/client/command/commands/gm2/IdCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.ThreadManager; @@ -31,7 +31,7 @@ public class IdCommand extends Command { @Override public void execute(MapleClient client, final String[] params) { - final MapleCharacter player = client.getPlayer(); + final Character player = client.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !id "); return; diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index da502495c2..f679382a27 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Pet; @@ -39,7 +39,7 @@ public class ItemCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !item "); diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java index 69f241c2de..06e3d5b5db 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemDropCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -40,7 +40,7 @@ public class ItemDropCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !drop "); diff --git a/src/main/java/client/command/commands/gm2/JailCommand.java b/src/main/java/client/command/commands/gm2/JailCommand.java index 55c5ae82f7..eac11882cf 100644 --- a/src/main/java/client/command/commands/gm2/JailCommand.java +++ b/src/main/java/client/command/commands/gm2/JailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -36,7 +36,7 @@ public class JailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !jail []"); return; @@ -51,7 +51,7 @@ public class JailCommand extends Command { } } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.addJailExpirationTime(minutesJailed * 60 * 1000); diff --git a/src/main/java/client/command/commands/gm2/JobCommand.java b/src/main/java/client/command/commands/gm2/JobCommand.java index 7edf328f17..a3846d5138 100644 --- a/src/main/java/client/command/commands/gm2/JobCommand.java +++ b/src/main/java/client/command/commands/gm2/JobCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleJob; import client.command.Command; @@ -35,7 +35,7 @@ public class JobCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length == 1) { int jobid = Integer.parseInt(params[0]); if (jobid < 0 || jobid >= 2200) { @@ -46,7 +46,7 @@ public class JobCommand extends Command { player.changeJob(MapleJob.getById(jobid)); player.equipChanged(); } else if (params.length == 2) { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int jobid = Integer.parseInt(params[1]); diff --git a/src/main/java/client/command/commands/gm2/LevelCommand.java b/src/main/java/client/command/commands/gm2/LevelCommand.java index 6074fb4161..7a87917c5c 100644 --- a/src/main/java/client/command/commands/gm2/LevelCommand.java +++ b/src/main/java/client/command/commands/gm2/LevelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class LevelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !level "); return; diff --git a/src/main/java/client/command/commands/gm2/LevelProCommand.java b/src/main/java/client/command/commands/gm2/LevelProCommand.java index 4a86e7e017..0441a518e6 100644 --- a/src/main/java/client/command/commands/gm2/LevelProCommand.java +++ b/src/main/java/client/command/commands/gm2/LevelProCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class LevelProCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !levelpro "); return; diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index e78b96c482..7d85807f70 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java @@ -23,6 +23,7 @@ */ package client.command.commands.gm2; +import client.Character; import client.*; import client.command.Command; import provider.MapleData; @@ -36,7 +37,7 @@ public class MaxSkillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); diff --git a/src/main/java/client/command/commands/gm2/MaxStatCommand.java b/src/main/java/client/command/commands/gm2/MaxStatCommand.java index cadf709fec..5d6962ffb1 100644 --- a/src/main/java/client/command/commands/gm2/MaxStatCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -36,7 +36,7 @@ public class MaxStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.loseExp(player.getExp(), false, false); player.setLevel(255); player.resetPlayerRates(); diff --git a/src/main/java/client/command/commands/gm2/ReachCommand.java b/src/main/java/client/command/commands/gm2/ReachCommand.java index 36c55c2768..6ef589081a 100644 --- a/src/main/java/client/command/commands/gm2/ReachCommand.java +++ b/src/main/java/client/command/commands/gm2/ReachCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -35,13 +35,13 @@ public class ReachCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !reach "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null && victim.isLoggedin()) { if (player.getClient().getChannel() != victim.getClient().getChannel()) { player.dropMessage(5, "Player '" + victim.getName() + "' is at channel " + victim.getClient().getChannel() + "."); diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java index 4df653a8c1..ede20c56d2 100644 --- a/src/main/java/client/command/commands/gm2/RechargeCommand.java +++ b/src/main/java/client/command/commands/gm2/RechargeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -38,7 +38,7 @@ public class RechargeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) { if (ItemConstants.isThrowingStar(torecharge.getItemId())){ diff --git a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java index 2c194c0ad6..1805858a5d 100644 --- a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java @@ -23,6 +23,7 @@ */ package client.command.commands.gm2; +import client.Character; import client.*; import client.command.Command; import provider.MapleData; @@ -36,7 +37,7 @@ public class ResetSkillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index e37eb609c0..cc7c442718 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/src/main/java/client/command/commands/gm2/SearchCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import provider.MapleData; @@ -53,7 +53,7 @@ public class SearchCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !search "); return; diff --git a/src/main/java/client/command/commands/gm2/SetSlotCommand.java b/src/main/java/client/command/commands/gm2/SetSlotCommand.java index af8a6b7ec8..2b58e52170 100644 --- a/src/main/java/client/command/commands/gm2/SetSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/SetSlotCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class SetSlotCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !setslot "); return; diff --git a/src/main/java/client/command/commands/gm2/SetStatCommand.java b/src/main/java/client/command/commands/gm2/SetStatCommand.java index 72807331f9..f73915321d 100644 --- a/src/main/java/client/command/commands/gm2/SetStatCommand.java +++ b/src/main/java/client/command/commands/gm2/SetStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class SetStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !setstat "); return; diff --git a/src/main/java/client/command/commands/gm2/SpCommand.java b/src/main/java/client/command/commands/gm2/SpCommand.java index 2ff1314d1e..ffca819dfe 100644 --- a/src/main/java/client/command/commands/gm2/SpCommand.java +++ b/src/main/java/client/command/commands/gm2/SpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class SpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !sp [] "); return; @@ -48,7 +48,7 @@ public class SpCommand extends Command { player.updateRemainingSp(newSp); } else { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int newSp = Integer.parseInt(params[1]); if (newSp < 0) newSp = 0; diff --git a/src/main/java/client/command/commands/gm2/SummonCommand.java b/src/main/java/client/command/commands/gm2/SummonCommand.java index f18d39920c..ad7da632a7 100644 --- a/src/main/java/client/command/commands/gm2/SummonCommand.java +++ b/src/main/java/client/command/commands/gm2/SummonCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,13 +37,13 @@ public class SummonCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warphere "); return; } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { //If victim isn't on current channel, loop all channels on current world. diff --git a/src/main/java/client/command/commands/gm2/UnHideCommand.java b/src/main/java/client/command/commands/gm2/UnHideCommand.java index a4652349ad..d7398df036 100644 --- a/src/main/java/client/command/commands/gm2/UnHideCommand.java +++ b/src/main/java/client/command/commands/gm2/UnHideCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class UnHideCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player); } diff --git a/src/main/java/client/command/commands/gm2/UnJailCommand.java b/src/main/java/client/command/commands/gm2/UnJailCommand.java index 36b8c8aa66..c4ef47940f 100644 --- a/src/main/java/client/command/commands/gm2/UnJailCommand.java +++ b/src/main/java/client/command/commands/gm2/UnJailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class UnJailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !unjail "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { if (victim.getJailExpirationTimeLeft() <= 0) { player.message("This player is already free."); diff --git a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java index 44817456b0..b3809ab4a7 100644 --- a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -38,7 +38,7 @@ public class WarpAreaCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warparea "); return; @@ -53,9 +53,9 @@ public class WarpAreaCommand extends Command { Point pos = player.getPosition(); - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter victim : characters) { + for (Character victim : characters) { if (victim.getPosition().distanceSq(pos) <= 50000) { victim.saveLocationOnWarp(); victim.changeMap(target, target.getRandomPlayerSpawnpoint()); diff --git a/src/main/java/client/command/commands/gm2/WarpCommand.java b/src/main/java/client/command/commands/gm2/WarpCommand.java index 776da6e327..53e90ee4e2 100644 --- a/src/main/java/client/command/commands/gm2/WarpCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.FieldLimit; @@ -37,7 +37,7 @@ public class WarpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warp "); return; diff --git a/src/main/java/client/command/commands/gm2/WarpMapCommand.java b/src/main/java/client/command/commands/gm2/WarpMapCommand.java index 6ea1da3515..cbc4069cd9 100644 --- a/src/main/java/client/command/commands/gm2/WarpMapCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,7 +37,7 @@ public class WarpMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warpmap "); return; @@ -50,9 +50,9 @@ public class WarpMapCommand extends Command { return; } - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter victim : characters) { + for (Character victim : characters) { victim.saveLocationOnWarp(); victim.changeMap(target, target.getRandomPlayerSpawnpoint()); } diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index b0635c99cc..9ac5a9b263 100644 --- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java +++ b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -40,9 +40,9 @@ public class WhereaMiCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); - HashSet chars = new HashSet<>(); + HashSet chars = new HashSet<>(); HashSet npcs = new HashSet<>(); HashSet playernpcs = new HashSet<>(); HashSet mobs = new HashSet<>(); @@ -51,8 +51,8 @@ public class WhereaMiCommand extends Command { if (mmo instanceof MapleNPC) { MapleNPC npc = (MapleNPC) mmo; npcs.add(npc); - } else if (mmo instanceof MapleCharacter) { - MapleCharacter mc = (MapleCharacter) mmo; + } else if (mmo instanceof Character) { + Character mc = (Character) mmo; chars.add(mc); } else if (mmo instanceof MapleMonster) { MapleMonster mob = (MapleMonster) mmo; @@ -68,7 +68,7 @@ public class WhereaMiCommand extends Command { player.yellowMessage("Map ID: " + player.getMap().getId()); player.yellowMessage("Players on this map:"); - for (MapleCharacter chr : chars) { + for (Character chr : chars) { player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId()); } diff --git a/src/main/java/client/command/commands/gm3/BanCommand.java b/src/main/java/client/command/commands/gm3/BanCommand.java index a6524147e9..01a616f569 100644 --- a/src/main/java/client/command/commands/gm3/BanCommand.java +++ b/src/main/java/client/command/commands/gm3/BanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -42,16 +42,16 @@ public class BanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !ban (Please be descriptive)"); return; } String ign = params[0]; String reason = joinStringFrom(params, 1); - MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign); + Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign); if (target != null) { - String readableTargetName = MapleCharacter.makeMapleReadable(target.getName()); + String readableTargetName = Character.makeMapleReadable(target.getName()); String ip = target.getClient().getRemoteAddress(); //Ban ip try (Connection con = DatabaseConnection.getConnection()) { @@ -74,10 +74,10 @@ public class BanCommand extends Command { target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k."); target.yellowMessage("Reason: " + reason); c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0)); - final MapleCharacter rip = target; + final Character rip = target; TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); - } else if (MapleCharacter.ban(ign, reason, false)) { + } else if (Character.ban(ign, reason, false)) { c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0)); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); } else { diff --git a/src/main/java/client/command/commands/gm3/ChatCommand.java b/src/main/java/client/command/commands/gm3/ChatCommand.java index 8931b55fd0..0b13070b2e 100644 --- a/src/main/java/client/command/commands/gm3/ChatCommand.java +++ b/src/main/java/client/command/commands/gm3/ChatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ChatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.toggleWhiteChat(); player.message("Your chat is now " + (player.getWhiteChat() ? " white" : "normal") + "."); } diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index b708812e21..1ca8c34906 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java @@ -24,7 +24,7 @@ package client.command.commands.gm3; import client.BuffStat; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -35,8 +35,8 @@ public class CheckDmgCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk()); Integer watkBuff = victim.getBuffedValue(BuffStat.WATK); diff --git a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java b/src/main/java/client/command/commands/gm3/ClosePortalCommand.java index 5e0b5d6709..fafc049f64 100644 --- a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java +++ b/src/main/java/client/command/commands/gm3/ClosePortalCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ClosePortalCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !closeportal "); return; diff --git a/src/main/java/client/command/commands/gm3/DebuffCommand.java b/src/main/java/client/command/commands/gm3/DebuffCommand.java index c60e006b3d..a7fc558f49 100644 --- a/src/main/java/client/command/commands/gm3/DebuffCommand.java +++ b/src/main/java/client/command/commands/gm3/DebuffCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleDisease; import client.command.Command; @@ -41,7 +41,7 @@ public class DebuffCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE"); return; @@ -108,7 +108,7 @@ public class DebuffCommand extends Command { } for (MapleMapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapleMapObjectType.PLAYER))) { - MapleCharacter chr = (MapleCharacter) mmo; + Character chr = (Character) mmo; if (chr.getId() != player.getId()) { chr.giveDebuff(disease, skill); diff --git a/src/main/java/client/command/commands/gm3/EndEventCommand.java b/src/main/java/client/command/commands/gm3/EndEventCommand.java index 3ccfb23c7a..d72674a098 100644 --- a/src/main/java/client/command/commands/gm3/EndEventCommand.java +++ b/src/main/java/client/command/commands/gm3/EndEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class EndEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getChannelServer().setEvent(null); player.dropMessage(5, "You have ended the event. No more players may join."); } diff --git a/src/main/java/client/command/commands/gm3/ExpedsCommand.java b/src/main/java/client/command/commands/gm3/ExpedsCommand.java index 45e3ac2ff6..eb5d492b17 100644 --- a/src/main/java/client/command/commands/gm3/ExpedsCommand.java +++ b/src/main/java/client/command/commands/gm3/ExpedsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -40,7 +40,7 @@ public class ExpedsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) { List expeds = ch.getExpeditions(); if (expeds.isEmpty()) { diff --git a/src/main/java/client/command/commands/gm3/FaceCommand.java b/src/main/java/client/command/commands/gm3/FaceCommand.java index e225159e69..13768eb78a 100644 --- a/src/main/java/client/command/commands/gm3/FaceCommand.java +++ b/src/main/java/client/command/commands/gm3/FaceCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -37,7 +37,7 @@ public class FaceCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !face [] "); return; @@ -60,7 +60,7 @@ public class FaceCommand extends Command { player.yellowMessage("Face id '" + params[1] + "' does not exist."); } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { victim.setFace(itemId); victim.updateSingleStat(MapleStat.FACE, itemId); diff --git a/src/main/java/client/command/commands/gm3/FameCommand.java b/src/main/java/client/command/commands/gm3/FameCommand.java index 6d38c9dfb8..68c9f2b359 100644 --- a/src/main/java/client/command/commands/gm3/FameCommand.java +++ b/src/main/java/client/command/commands/gm3/FameCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -35,13 +35,13 @@ public class FameCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !fame "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setFame(Integer.parseInt(params[1])); victim.updateSingleStat(MapleStat.FAME, victim.getFame()); diff --git a/src/main/java/client/command/commands/gm3/FlyCommand.java b/src/main/java/client/command/commands/gm3/FlyCommand.java index 138dd9bdb6..9671f929ca 100644 --- a/src/main/java/client/command/commands/gm3/FlyCommand.java +++ b/src/main/java/client/command/commands/gm3/FlyCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -35,7 +35,7 @@ public class FlyCommand extends Command { @Override public void execute(MapleClient c, String[] params) { // fly option will become available for any character of that account - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !fly "); return; diff --git a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java index 3d86c8ee06..a59f90f032 100644 --- a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class GiveMesosCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !givems [] "); return; @@ -66,7 +66,7 @@ public class GiveMesosCommand extends Command { } } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_); if (victim != null) { victim.gainMeso((int) mesos_, true); player.message("MESO given."); diff --git a/src/main/java/client/command/commands/gm3/GiveNxCommand.java b/src/main/java/client/command/commands/gm3/GiveNxCommand.java index b04b2de021..ecb360aa6f 100644 --- a/src/main/java/client/command/commands/gm3/GiveNxCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveNxCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class GiveNxCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !givenx [nx, mp, np] [] "); return; @@ -72,7 +72,7 @@ public class GiveNxCommand extends Command { value = Integer.parseInt(params[0]); } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv); if (victim != null) { victim.getCashShop().gainCash(type, value); player.message(typeStr.toUpperCase() + " given."); diff --git a/src/main/java/client/command/commands/gm3/GiveRpCommand.java b/src/main/java/client/command/commands/gm3/GiveRpCommand.java index f43d8753b1..2a2a88b41e 100644 --- a/src/main/java/client/command/commands/gm3/GiveRpCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveRpCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -11,13 +11,13 @@ public class GiveRpCommand extends Command { @Override public void execute(MapleClient client, String[] params) { - MapleCharacter player = client.getPlayer(); + Character player = client.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !giverp "); return; } - MapleCharacter victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1])); player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints() diff --git a/src/main/java/client/command/commands/gm3/GiveVpCommand.java b/src/main/java/client/command/commands/gm3/GiveVpCommand.java index f677e874cd..91fbe3d5f2 100644 --- a/src/main/java/client/command/commands/gm3/GiveVpCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveVpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class GiveVpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !givevp "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.getClient().addVotePoints(Integer.parseInt(params[1])); player.message("VP given."); diff --git a/src/main/java/client/command/commands/gm3/HairCommand.java b/src/main/java/client/command/commands/gm3/HairCommand.java index 22f01cf49a..d4be80ed8f 100644 --- a/src/main/java/client/command/commands/gm3/HairCommand.java +++ b/src/main/java/client/command/commands/gm3/HairCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -37,7 +37,7 @@ public class HairCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !hair [] "); return; @@ -61,7 +61,7 @@ public class HairCommand extends Command { return; } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setHair(itemId); victim.updateSingleStat(MapleStat.HAIR, itemId); diff --git a/src/main/java/client/command/commands/gm3/HealMapCommand.java b/src/main/java/client/command/commands/gm3/HealMapCommand.java index 8a870350ea..bff482dc19 100644 --- a/src/main/java/client/command/commands/gm3/HealMapCommand.java +++ b/src/main/java/client/command/commands/gm3/HealMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HealMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - for (MapleCharacter mch : player.getMap().getCharacters()) { + Character player = c.getPlayer(); + for (Character mch : player.getMap().getCharacters()) { if (mch != null) { mch.healHpMp(); } diff --git a/src/main/java/client/command/commands/gm3/HealPersonCommand.java b/src/main/java/client/command/commands/gm3/HealPersonCommand.java index 9c2cde8e38..7e03ad41b3 100644 --- a/src/main/java/client/command/commands/gm3/HealPersonCommand.java +++ b/src/main/java/client/command/commands/gm3/HealPersonCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HealPersonCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.healHpMp(); } else { diff --git a/src/main/java/client/command/commands/gm3/HpMpCommand.java b/src/main/java/client/command/commands/gm3/HpMpCommand.java index c67a199faa..94baeacf56 100644 --- a/src/main/java/client/command/commands/gm3/HpMpCommand.java +++ b/src/main/java/client/command/commands/gm3/HpMpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HpMpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = player; + Character player = c.getPlayer(); + Character victim = player; int statUpdate = 1; if (params.length == 2) { diff --git a/src/main/java/client/command/commands/gm3/HurtCommand.java b/src/main/java/client/command/commands/gm3/HurtCommand.java index 6eb93ca6c3..3ef3a655c4 100644 --- a/src/main/java/client/command/commands/gm3/HurtCommand.java +++ b/src/main/java/client/command/commands/gm3/HurtCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HurtCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.updateHp(1); } else { diff --git a/src/main/java/client/command/commands/gm3/IgnoreCommand.java b/src/main/java/client/command/commands/gm3/IgnoreCommand.java index d935639104..62183d52b5 100644 --- a/src/main/java/client/command/commands/gm3/IgnoreCommand.java +++ b/src/main/java/client/command/commands/gm3/IgnoreCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -37,12 +37,12 @@ public class IgnoreCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !ignore "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { player.message("Player '" + params[0] + "' could not be found on this world."); return; diff --git a/src/main/java/client/command/commands/gm3/IgnoredCommand.java b/src/main/java/client/command/commands/gm3/IgnoredCommand.java index daf704699d..39bc60eca4 100644 --- a/src/main/java/client/command/commands/gm3/IgnoredCommand.java +++ b/src/main/java/client/command/commands/gm3/IgnoredCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -35,9 +35,9 @@ public class IgnoredCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Integer cid : MapleLogger.ignored) { - player.yellowMessage(MapleCharacter.getNameById(cid) + " is being ignored."); + player.yellowMessage(Character.getNameById(cid) + " is being ignored."); } } } diff --git a/src/main/java/client/command/commands/gm3/InMapCommand.java b/src/main/java/client/command/commands/gm3/InMapCommand.java index ef66e72085..8ad6c6bfcc 100644 --- a/src/main/java/client/command/commands/gm3/InMapCommand.java +++ b/src/main/java/client/command/commands/gm3/InMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,9 +34,9 @@ public class InMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String st = ""; - for (MapleCharacter chr : player.getMap().getCharacters()) { + for (Character chr : player.getMap().getCharacters()) { st += chr.getName() + " "; } player.message(st); diff --git a/src/main/java/client/command/commands/gm3/KillAllCommand.java b/src/main/java/client/command/commands/gm3/KillAllCommand.java index db5e0cc40c..84c1c6b000 100644 --- a/src/main/java/client/command/commands/gm3/KillAllCommand.java +++ b/src/main/java/client/command/commands/gm3/KillAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -41,7 +41,7 @@ public class KillAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMap map = player.getMap(); List monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)); int count = 0; diff --git a/src/main/java/client/command/commands/gm3/KillCommand.java b/src/main/java/client/command/commands/gm3/KillCommand.java index 135474b096..3baae93d25 100644 --- a/src/main/java/client/command/commands/gm3/KillCommand.java +++ b/src/main/java/client/command/commands/gm3/KillCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,13 +36,13 @@ public class KillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !kill "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.updateHpMp(0); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName())); diff --git a/src/main/java/client/command/commands/gm3/KillMapCommand.java b/src/main/java/client/command/commands/gm3/KillMapCommand.java index 486bf8e628..d51ab22a22 100644 --- a/src/main/java/client/command/commands/gm3/KillMapCommand.java +++ b/src/main/java/client/command/commands/gm3/KillMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class KillMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - for (MapleCharacter mch : player.getMap().getCharacters()) { + Character player = c.getPlayer(); + for (Character mch : player.getMap().getCharacters()) { mch.updateHp(0); } } diff --git a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java index f43b066c05..83045bf97e 100644 --- a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class MaxEnergyCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getPlayer().setDojoEnergy(10000); c.sendPacket(PacketCreator.getEnergy("energy", 10000)); } diff --git a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java index 7100dcbf84..756357db91 100644 --- a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class MaxHpMpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = player; + Character player = c.getPlayer(); + Character victim = player; int statUpdate = 1; if (params.length >= 2) { diff --git a/src/main/java/client/command/commands/gm3/MonitorCommand.java b/src/main/java/client/command/commands/gm3/MonitorCommand.java index 7f05db7521..aa9f01f6dc 100644 --- a/src/main/java/client/command/commands/gm3/MonitorCommand.java +++ b/src/main/java/client/command/commands/gm3/MonitorCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -37,12 +37,12 @@ public class MonitorCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !monitor "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { player.message("Player '" + params[0] + "' could not be found on this world."); return; diff --git a/src/main/java/client/command/commands/gm3/MonitorsCommand.java b/src/main/java/client/command/commands/gm3/MonitorsCommand.java index 97fd37a9d4..e6a4ef40ec 100644 --- a/src/main/java/client/command/commands/gm3/MonitorsCommand.java +++ b/src/main/java/client/command/commands/gm3/MonitorsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -35,9 +35,9 @@ public class MonitorsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Integer cid : MapleLogger.monitored) { - player.yellowMessage(MapleCharacter.getNameById(cid) + " is being monitored."); + player.yellowMessage(Character.getNameById(cid) + " is being monitored."); } } } diff --git a/src/main/java/client/command/commands/gm3/MusicCommand.java b/src/main/java/client/command/commands/gm3/MusicCommand.java index bca318bb10..34f747af36 100644 --- a/src/main/java/client/command/commands/gm3/MusicCommand.java +++ b/src/main/java/client/command/commands/gm3/MusicCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -46,7 +46,7 @@ public class MusicCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { String sendMsg = ""; diff --git a/src/main/java/client/command/commands/gm3/MuteMapCommand.java b/src/main/java/client/command/commands/gm3/MuteMapCommand.java index 90dd6062ef..2c6e2558dc 100644 --- a/src/main/java/client/command/commands/gm3/MuteMapCommand.java +++ b/src/main/java/client/command/commands/gm3/MuteMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class MuteMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (player.getMap().isMuted()) { player.getMap().setMuted(false); player.dropMessage(5, "The map you are in has been un-muted."); diff --git a/src/main/java/client/command/commands/gm3/NightCommand.java b/src/main/java/client/command/commands/gm3/NightCommand.java index fa17256f5a..26389dba9d 100644 --- a/src/main/java/client/command/commands/gm3/NightCommand.java +++ b/src/main/java/client/command/commands/gm3/NightCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class NightCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().broadcastNightEffect(); player.yellowMessage("Done."); } diff --git a/src/main/java/client/command/commands/gm3/NoticeCommand.java b/src/main/java/client/command/commands/gm3/NoticeCommand.java index f321d170d0..656ce0fdcf 100644 --- a/src/main/java/client/command/commands/gm3/NoticeCommand.java +++ b/src/main/java/client/command/commands/gm3/NoticeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class NoticeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage())); } } diff --git a/src/main/java/client/command/commands/gm3/NpcCommand.java b/src/main/java/client/command/commands/gm3/NpcCommand.java index 28c937a591..ce867159e3 100644 --- a/src/main/java/client/command/commands/gm3/NpcCommand.java +++ b/src/main/java/client/command/commands/gm3/NpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -37,7 +37,7 @@ public class NpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !npc "); return; diff --git a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java index 103439efcf..f16dbc381b 100644 --- a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java +++ b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,15 +36,15 @@ public class OnlineTwoCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int total = 0; for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) { int size = ch.getPlayerStorage().getAllCharacters().size(); total += size; String s = "(Channel " + ch.getId() + " Online: " + size + ") : "; if (ch.getPlayerStorage().getAllCharacters().size() < 50) { - for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) { - s += MapleCharacter.makeMapleReadable(chr.getName()) + ", "; + for (Character chr : ch.getPlayerStorage().getAllCharacters()) { + s += Character.makeMapleReadable(chr.getName()) + ", "; } player.dropMessage(6, s.substring(0, s.length() - 2)); } diff --git a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java b/src/main/java/client/command/commands/gm3/OpenPortalCommand.java index 46810f587e..b4466597ee 100644 --- a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java +++ b/src/main/java/client/command/commands/gm3/OpenPortalCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class OpenPortalCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !openportal "); return; diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java index e9a5e61de7..72c13f18b9 100644 --- a/src/main/java/client/command/commands/gm3/PeCommand.java +++ b/src/main/java/client/command/commands/gm3/PeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import io.netty.buffer.Unpooled; @@ -46,7 +46,7 @@ public class PeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String packet = ""; try { InputStreamReader is = new FileReader("pe.txt"); diff --git a/src/main/java/client/command/commands/gm3/PosCommand.java b/src/main/java/client/command/commands/gm3/PosCommand.java index f4ebc8d758..4c4611a5da 100644 --- a/src/main/java/client/command/commands/gm3/PosCommand.java +++ b/src/main/java/client/command/commands/gm3/PosCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class PosCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); float xpos = player.getPosition().x; float ypos = player.getPosition().y; float fh = player.getMap().getFootholds().findBelow(player.getPosition()).getId(); diff --git a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java index eb8bb787e0..17fa0885db 100644 --- a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestCompleteCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !completequest "); diff --git a/src/main/java/client/command/commands/gm3/QuestResetCommand.java b/src/main/java/client/command/commands/gm3/QuestResetCommand.java index 99fa79a106..cf650179bf 100644 --- a/src/main/java/client/command/commands/gm3/QuestResetCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestResetCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestResetCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !resetquest "); diff --git a/src/main/java/client/command/commands/gm3/QuestStartCommand.java b/src/main/java/client/command/commands/gm3/QuestStartCommand.java index 70e3c5b6f4..444c9e3d07 100644 --- a/src/main/java/client/command/commands/gm3/QuestStartCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestStartCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestStartCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !startquest "); diff --git a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java index 71c3cd66e2..4367379459 100644 --- a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonsterInformationProvider; @@ -35,7 +35,7 @@ public class ReloadDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMonsterInformationProvider.getInstance().clearDrops(); player.dropMessage(5, "Reloaded Drops"); } diff --git a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java b/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java index 5eda37558d..b08b24fcc6 100644 --- a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ReloadEventsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getAllChannels()) { ch.reloadEventScriptManager(); } diff --git a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java index ed1910c45a..e0705bc85d 100644 --- a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,13 +37,13 @@ public class ReloadMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMap newMap = c.getChannelServer().getMapFactory().resetMap(player.getMapId()); int callerid = c.getPlayer().getId(); - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter chr : characters) { + for (Character chr : characters) { chr.saveLocationOnWarp(); chr.changeMap(newMap); if (chr.getId() != callerid) diff --git a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java index 42722196a6..c5d54e169b 100644 --- a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import scripting.portal.PortalScriptManager; @@ -35,7 +35,7 @@ public class ReloadPortalsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); PortalScriptManager.getInstance().reloadPortalScripts(); player.dropMessage(5, "Reloaded Portals"); } diff --git a/src/main/java/client/command/commands/gm3/RipCommand.java b/src/main/java/client/command/commands/gm3/RipCommand.java index 06cbb73c9e..911af10115 100644 --- a/src/main/java/client/command/commands/gm3/RipCommand.java +++ b/src/main/java/client/command/commands/gm3/RipCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class RipCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1))); } } diff --git a/src/main/java/client/command/commands/gm3/SeedCommand.java b/src/main/java/client/command/commands/gm3/SeedCommand.java index 9824d4518a..765bb4278b 100644 --- a/src/main/java/client/command/commands/gm3/SeedCommand.java +++ b/src/main/java/client/command/commands/gm3/SeedCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Item; @@ -37,7 +37,7 @@ public class SeedCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (player.getMapId() != 910010000) { player.yellowMessage("This command can only be used in HPQ."); return; diff --git a/src/main/java/client/command/commands/gm3/SpawnCommand.java b/src/main/java/client/command/commands/gm3/SpawnCommand.java index f9ec285b69..c027512848 100644 --- a/src/main/java/client/command/commands/gm3/SpawnCommand.java +++ b/src/main/java/client/command/commands/gm3/SpawnCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -36,7 +36,7 @@ public class SpawnCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !spawn []"); return; diff --git a/src/main/java/client/command/commands/gm3/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java index 855fa36843..9863014e33 100644 --- a/src/main/java/client/command/commands/gm3/StartEventCommand.java +++ b/src/main/java/client/command/commands/gm3/StartEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,7 +37,7 @@ public class StartEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int players = 50; if (params.length > 1) players = Integer.parseInt(params[0]); diff --git a/src/main/java/client/command/commands/gm3/TimerAllCommand.java b/src/main/java/client/command/commands/gm3/TimerAllCommand.java index f58898dd43..606b30b01c 100644 --- a/src/main/java/client/command/commands/gm3/TimerAllCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,20 +35,20 @@ public class TimerAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !timerall |remove"); return; } if (params[0].equalsIgnoreCase("remove")) { - for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { + for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { victim.sendPacket(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); - for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { + for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { victim.sendPacket(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { diff --git a/src/main/java/client/command/commands/gm3/TimerCommand.java b/src/main/java/client/command/commands/gm3/TimerCommand.java index 927dc40571..0d56682f80 100644 --- a/src/main/java/client/command/commands/gm3/TimerCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,13 +35,13 @@ public class TimerCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !timer |remove"); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { if (params[1].equalsIgnoreCase("remove")) { victim.sendPacket(PacketCreator.removeClock()); diff --git a/src/main/java/client/command/commands/gm3/TimerMapCommand.java b/src/main/java/client/command/commands/gm3/TimerMapCommand.java index 6b10b51092..540245df86 100644 --- a/src/main/java/client/command/commands/gm3/TimerMapCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,20 +35,20 @@ public class TimerMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !timermap |remove"); return; } if (params[0].equalsIgnoreCase("remove")) { - for (MapleCharacter victim : player.getMap().getCharacters()) { + for (Character victim : player.getMap().getCharacters()) { victim.sendPacket(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); - for (MapleCharacter victim : player.getMap().getCharacters()) { + for (Character victim : player.getMap().getCharacters()) { victim.sendPacket(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { diff --git a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java index e5bba02906..c8485103b6 100644 --- a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java +++ b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -35,7 +35,7 @@ public class ToggleCouponCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !togglecoupon "); return; diff --git a/src/main/java/client/command/commands/gm3/UnBanCommand.java b/src/main/java/client/command/commands/gm3/UnBanCommand.java index 1a67ecc59b..5865424a3f 100644 --- a/src/main/java/client/command/commands/gm3/UnBanCommand.java +++ b/src/main/java/client/command/commands/gm3/UnBanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.DatabaseConnection; @@ -38,14 +38,14 @@ public class UnBanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !unban "); return; } try (Connection con = DatabaseConnection.getConnection()) { - int aid = MapleCharacter.getAccountIdByName(params[0]); + int aid = Character.getAccountIdByName(params[0]); try (PreparedStatement p = con.prepareStatement("UPDATE accounts SET banned = -1 WHERE id = " + aid)) { p.executeUpdate(); diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java index 14cc40935a..2f80a806d9 100644 --- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java @@ -19,7 +19,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class BossDropRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !bossdroprate "); return; diff --git a/src/main/java/client/command/commands/gm4/CakeCommand.java b/src/main/java/client/command/commands/gm4/CakeCommand.java index 248c55361e..1aa6c99da6 100644 --- a/src/main/java/client/command/commands/gm4/CakeCommand.java +++ b/src/main/java/client/command/commands/gm4/CakeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -36,7 +36,7 @@ public class CakeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMonster monster = MapleLifeFactory.getMonster(9400606); if (params.length == 1) { double mobHp = Double.parseDouble(params[0]); diff --git a/src/main/java/client/command/commands/gm4/DropRateCommand.java b/src/main/java/client/command/commands/gm4/DropRateCommand.java index 1dda95d9a9..bf7399abf0 100644 --- a/src/main/java/client/command/commands/gm4/DropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/DropRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class DropRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !droprate "); return; diff --git a/src/main/java/client/command/commands/gm4/ExpRateCommand.java b/src/main/java/client/command/commands/gm4/ExpRateCommand.java index a1fe479708..ab025517ac 100644 --- a/src/main/java/client/command/commands/gm4/ExpRateCommand.java +++ b/src/main/java/client/command/commands/gm4/ExpRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class ExpRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !exprate "); return; diff --git a/src/main/java/client/command/commands/gm4/FishingRateCommand.java b/src/main/java/client/command/commands/gm4/FishingRateCommand.java index 768d896533..4cf57d21cd 100644 --- a/src/main/java/client/command/commands/gm4/FishingRateCommand.java +++ b/src/main/java/client/command/commands/gm4/FishingRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class FishingRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !fishrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index c744e5ba1e..1e7f9937f8 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Pet; @@ -43,7 +43,7 @@ public class ForceVacCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : items) { MapleMapItem mapItem = (MapleMapItem) item; diff --git a/src/main/java/client/command/commands/gm4/HorntailCommand.java b/src/main/java/client/command/commands/gm4/HorntailCommand.java index 0a1282b05f..c236086740 100644 --- a/src/main/java/client/command/commands/gm4/HorntailCommand.java +++ b/src/main/java/client/command/commands/gm4/HorntailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,7 +37,7 @@ public class HorntailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); final Point targetPoint = player.getPosition(); final MapleMap targetMap = player.getMap(); diff --git a/src/main/java/client/command/commands/gm4/ItemVacCommand.java b/src/main/java/client/command/commands/gm4/ItemVacCommand.java index dc4dfe425b..9c3311e9fd 100644 --- a/src/main/java/client/command/commands/gm4/ItemVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ItemVacCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMapObject; @@ -39,7 +39,7 @@ public class ItemVacCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : list) { player.pickupItem(item); diff --git a/src/main/java/client/command/commands/gm4/MesoRateCommand.java b/src/main/java/client/command/commands/gm4/MesoRateCommand.java index 944a6bef9d..fb1eb57c90 100644 --- a/src/main/java/client/command/commands/gm4/MesoRateCommand.java +++ b/src/main/java/client/command/commands/gm4/MesoRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class MesoRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !mesorate "); return; diff --git a/src/main/java/client/command/commands/gm4/PapCommand.java b/src/main/java/client/command/commands/gm4/PapCommand.java index 7e51fb8da5..9b9baa029c 100644 --- a/src/main/java/client/command/commands/gm4/PapCommand.java +++ b/src/main/java/client/command/commands/gm4/PapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); // thanks Conrad for noticing mobid typo here player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8500001), player.getPosition()); diff --git a/src/main/java/client/command/commands/gm4/PianusCommand.java b/src/main/java/client/command/commands/gm4/PianusCommand.java index a16cd355ee..361a23dec7 100644 --- a/src/main/java/client/command/commands/gm4/PianusCommand.java +++ b/src/main/java/client/command/commands/gm4/PianusCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PianusCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8510000), player.getPosition()); } } diff --git a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java b/src/main/java/client/command/commands/gm4/PinkbeanCommand.java index eb7fb8a38f..7e1d5aa125 100644 --- a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java +++ b/src/main/java/client/command/commands/gm4/PinkbeanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PinkbeanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8820001), player.getPosition()); } diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java index 264287d45f..2c1aaaec73 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MaplePlayerNPC; @@ -35,7 +35,7 @@ public class PlayerNpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !playernpc "); return; diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java index 6654b2b0c2..c7c9f24763 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MaplePlayerNPC; @@ -35,7 +35,7 @@ public class PlayerNpcRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !playernpcremove "); return; diff --git a/src/main/java/client/command/commands/gm4/PmobCommand.java b/src/main/java/client/command/commands/gm4/PmobCommand.java index 0b416980c8..e8d83e3ade 100644 --- a/src/main/java/client/command/commands/gm4/PmobCommand.java +++ b/src/main/java/client/command/commands/gm4/PmobCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -44,7 +44,7 @@ public class PmobCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !pmob []"); return; diff --git a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java index 98ea14acf5..715da68206 100644 --- a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -46,7 +46,7 @@ public class PmobRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int mapId = player.getMapId(); int mobId = params.length > 0 ? Integer.parseInt(params[0]) : -1; diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java index 1b15f81832..9d5206e148 100644 --- a/src/main/java/client/command/commands/gm4/PnpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -45,7 +45,7 @@ public class PnpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !pnpc "); return; diff --git a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java index f441a95774..8ea17ada56 100644 --- a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -46,7 +46,7 @@ public class PnpcRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int mapId = player.getMapId(); int npcId = params.length > 0 ? Integer.parseInt(params[0]) : -1; diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java index ecfb612b1d..2259ea391b 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/src/main/java/client/command/commands/gm4/ProItemCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Equip; @@ -40,7 +40,7 @@ public class ProItemCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !proitem []"); return; diff --git a/src/main/java/client/command/commands/gm4/QuestRateCommand.java b/src/main/java/client/command/commands/gm4/QuestRateCommand.java index 855fe1caa8..7b54ec2a3c 100644 --- a/src/main/java/client/command/commands/gm4/QuestRateCommand.java +++ b/src/main/java/client/command/commands/gm4/QuestRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class QuestRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !questrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java index a58e4d5466..bfb1481451 100644 --- a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java +++ b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ServerMessageCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getWorldServer().setServerMessage(player.getLastCommandMessage()); } } diff --git a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java index 7b4ba19bc8..3549ca2bf8 100644 --- a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java +++ b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Equip; @@ -38,7 +38,7 @@ public class SetEqStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !seteqstat []"); return; diff --git a/src/main/java/client/command/commands/gm4/TravelRateCommand.java b/src/main/java/client/command/commands/gm4/TravelRateCommand.java index 14da01f08f..6d988b14d3 100644 --- a/src/main/java/client/command/commands/gm4/TravelRateCommand.java +++ b/src/main/java/client/command/commands/gm4/TravelRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class TravelRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !travelrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ZakumCommand.java b/src/main/java/client/command/commands/gm4/ZakumCommand.java index 2dbbfa1207..74b03ad936 100644 --- a/src/main/java/client/command/commands/gm4/ZakumCommand.java +++ b/src/main/java/client/command/commands/gm4/ZakumCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class ZakumCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8800000), player.getPosition()); for (int x = 8800003; x < 8800011; x++) { player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(x), player.getPosition()); diff --git a/src/main/java/client/command/commands/gm5/DebugCommand.java b/src/main/java/client/command/commands/gm5/DebugCommand.java index 019f703912..9523376eca 100644 --- a/src/main/java/client/command/commands/gm5/DebugCommand.java +++ b/src/main/java/client/command/commands/gm5/DebugCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm5; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -48,7 +48,7 @@ public class DebugCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !debug "); @@ -70,7 +70,7 @@ public class DebugCommand extends Command { List monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)); for (MapleMapObject monstermo : monsters) { MapleMonster monster = (MapleMonster) monstermo; - MapleCharacter controller = monster.getController(); + Character controller = monster.getController(); player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() + " Has aggro: " + monster.isControllerHasAggro() + " Knowns aggro: " + monster.isControllerKnowsAboutAggro() : "")); } break; diff --git a/src/main/java/client/command/commands/gm5/IpListCommand.java b/src/main/java/client/command/commands/gm5/IpListCommand.java index c7ae291fbd..35a19376ab 100644 --- a/src/main/java/client/command/commands/gm5/IpListCommand.java +++ b/src/main/java/client/command/commands/gm5/IpListCommand.java @@ -19,7 +19,7 @@ */ package client.command.commands.gm5; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -44,12 +44,12 @@ public class IpListCommand extends Command { String str = "Player-IP relation:"; for (World w : Server.getInstance().getWorlds()) { - Collection chars = w.getPlayerStorage().getAllCharacters(); + Collection chars = w.getPlayerStorage().getAllCharacters(); if (!chars.isEmpty()) { str += "\r\n" + GameConstants.WORLD_NAMES[w.getId()] + "\r\n"; - for (MapleCharacter chr : chars) { + for (Character chr : chars) { str += " " + chr.getName() + " - " + chr.getClient().getRemoteAddress() + "\r\n"; } } diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java index 19a49bc430..211a6a67e6 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java +++ b/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class ClearQuestCacheCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleQuest.clearCache(); player.dropMessage(5, "Quest Cache Cleared."); } diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCommand.java index dfe63ac229..787529009b 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java +++ b/src/main/java/client/command/commands/gm6/ClearQuestCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class ClearQuestCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please include a quest ID."); return; diff --git a/src/main/java/client/command/commands/gm6/DCAllCommand.java b/src/main/java/client/command/commands/gm6/DCAllCommand.java index 139301174c..6aa0b9b8bc 100644 --- a/src/main/java/client/command/commands/gm6/DCAllCommand.java +++ b/src/main/java/client/command/commands/gm6/DCAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,9 +36,9 @@ public class DCAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { if (!chr.isGM()) { chr.getClient().disconnect(false, false); } diff --git a/src/main/java/client/command/commands/gm6/GetAccCommand.java b/src/main/java/client/command/commands/gm6/GetAccCommand.java index d0c550a8c3..a12e44bcf6 100644 --- a/src/main/java/client/command/commands/gm6/GetAccCommand.java +++ b/src/main/java/client/command/commands/gm6/GetAccCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,12 +34,12 @@ public class GetAccCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !getacc "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { player.message(victim.getName() + "'s account name is " + victim.getClient().getAccountName() + "."); } else { diff --git a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java index a5f42142d6..bf580cb018 100644 --- a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java +++ b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,11 +36,11 @@ public class MapPlayersCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String names = ""; int map = player.getMapId(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { int curMap = chr.getMapId(); String hp = Integer.toString(chr.getHp()); String maxhp = Integer.toString(chr.getCurrentMaxHp()); diff --git a/src/main/java/client/command/commands/gm6/SaveAllCommand.java b/src/main/java/client/command/commands/gm6/SaveAllCommand.java index d6a117a24f..9155cf8f9b 100644 --- a/src/main/java/client/command/commands/gm6/SaveAllCommand.java +++ b/src/main/java/client/command/commands/gm6/SaveAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,9 +37,9 @@ public class SaveAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { chr.saveCharToDB(); } } diff --git a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java index 4e5cbcca39..75615ad3f2 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerAddChannelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Syntax: @addchannel "); diff --git a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java index 2fa045c58c..737d419167 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerAddWorldCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); ThreadManager.getInstance().newTask(() -> { int wid = Server.getInstance().addWorld(); diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java index fa2b379d07..35dce0e49e 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerRemoveChannelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Syntax: @removechannel "); diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java index 0692b3ed51..9e8df91d1a 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerRemoveWorldCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); final int rwid = Server.getInstance().getWorldsSize() - 1; if(rwid <= 0) { diff --git a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java b/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java index 00ca92a224..7bdb42305e 100644 --- a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java +++ b/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,14 +34,14 @@ public class SetGmLevelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !setgmlevel "); return; } int newLevel = Integer.parseInt(params[1]); - MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (target != null) { target.setGMLevel(newLevel); target.getClient().setGMLevel(newLevel); diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index 2f4797b606..acd7169b85 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/src/main/java/client/command/commands/gm6/ShutdownCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,7 +37,7 @@ public class ShutdownCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !shutdown [