From cbb1ad50f34f3725f4a1ae9e0372e47421b34351 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 4 Nov 2020 03:03:30 +0000 Subject: [PATCH] Dropped base and entity packages. --- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q00784_TheQuietKiller.java | 2 +- .../Q00785_ASuspiciousIngredient.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../base => enums}/AcquireSkillType.java | 2 +- .../l2jmobius/gameserver/enums}/ClassId.java | 3 +- .../gameserver/enums}/PlayerState.java | 2 +- .../gameserver/enums}/SocialClass.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events}/GameEvent.java | 2 +- .../games/BlockChecker.java} | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model}/Couple.java | 2 +- .../org/l2jmobius/gameserver/model}/Duel.java | 3 +- .../l2jmobius/gameserver/model}/Message.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 6 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 8 +- .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences}/Bidder.java | 2 +- .../model/residences}/ClanHall.java | 3 +- .../model/residences}/ClanHallAuction.java | 3 +- .../gameserver/model/siege}/Castle.java | 2 +- .../gameserver/model/siege}/Fort.java | 2 +- .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege}/Siegable.java | 2 +- .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q00784_TheQuietKiller.java | 2 +- .../Q00785_ASuspiciousIngredient.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums}/AcquireSkillType.java | 2 +- .../l2jmobius/gameserver/enums}/ClassId.java | 3 +- .../gameserver/enums}/PlayerState.java | 2 +- .../gameserver/enums}/SocialClass.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events}/GameEvent.java | 2 +- .../instancemanager/games/BlockChecker.java | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model}/Couple.java | 2 +- .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model}/Duel.java | 3 +- .../l2jmobius/gameserver/model}/Message.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 6 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../clanhallauction/ClanHallAuction.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 8 +- .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../{entity => residences}/ClanHall.java | 3 +- .../gameserver/model/siege}/Castle.java | 2 +- .../gameserver/model/siege}/Fort.java | 2 +- .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege}/Siegable.java | 2 +- .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- ...ueenNavarisLetterVarkaSilenosBarracks.java | 2 +- ...525_QueenNavarisLetterKetraOrcOutpost.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums}/AcquireSkillType.java | 2 +- .../l2jmobius/gameserver/enums}/ClassId.java | 3 +- .../gameserver/enums}/PlayerState.java | 2 +- .../gameserver/enums}/SocialClass.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events}/GameEvent.java | 2 +- .../instancemanager/games/BlockChecker.java | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model}/Couple.java | 2 +- .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model}/Duel.java | 3 +- .../l2jmobius/gameserver/model}/Message.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 6 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 8 +- .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../Bidder.java | 2 +- .../model/residences}/ClanHall.java | 3 +- .../model/residences}/ClanHallAuction.java | 3 +- .../gameserver/model/siege}/Castle.java | 2 +- .../gameserver/model/siege}/Fort.java | 2 +- .../gameserver/model/siege}/FortSiege.java | 2 +- .../gameserver/model/siege}/Siegable.java | 2 +- .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- ...ueenNavarisLetterVarkaSilenosBarracks.java | 2 +- ...525_QueenNavarisLetterKetraOrcOutpost.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../base => enums}/AcquireSkillType.java | 2 +- .../l2jmobius/gameserver/enums}/ClassId.java | 3 +- .../gameserver/enums}/PlayerState.java | 2 +- .../{model/base => enums}/SocialClass.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events}/GameEvent.java | 2 +- .../instancemanager/games/BlockChecker.java | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model}/Couple.java | 2 +- .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model}/Duel.java | 3 +- .../model/{entity => }/Message.java | 2 +- .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 6 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../ClassInfoHolder.java} | 8 +- .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences}/Bidder.java | 2 +- .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences}/ClanHallAuction.java | 3 +- .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege}/Fort.java | 2 +- .../gameserver/model/siege}/FortSiege.java | 2 +- .../gameserver/model/siege}/Siegable.java | 2 +- .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- ...ueenNavarisLetterVarkaSilenosBarracks.java | 2 +- ...525_QueenNavarisLetterKetraOrcOutpost.java | 2 +- .../Q10560_WayOfWanderingKnight.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../gameserver/model/{entity => }/Duel.java | 3 +- .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../Bidder.java | 2 +- .../gameserver/model/residences/ClanHall.java | 397 ++++ .../ClanHallAuction.java | 3 +- .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- ...ueenNavarisLetterVarkaSilenosBarracks.java | 2 +- ...525_QueenNavarisLetterKetraOrcOutpost.java | 2 +- .../Q10560_WayOfWanderingKnight.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../MemoryOfDisaster/MemoryOfDisaster.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10338_SeizeYourDestiny.java | 2 +- .../Q10360_CertificationOfFate.java | 2 +- ...ueenNavarisLetterVarkaSilenosBarracks.java | 2 +- ...525_QueenNavarisLetterKetraOrcOutpost.java | 2 +- .../Q10560_WayOfWanderingKnight.java | 2 +- .../Q10735_ASpecialPower.java | 2 +- .../Q10736_ASpecialPower.java | 2 +- .../Q10751_WindsOfFateEncounters.java | 2 +- .../Q10752_WindsOfFateAPromise.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../ai/areas/Aden/Gallias/Gallias.java | 4 +- .../ai/areas/Aden/Joachim/Joachim.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 2 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q11027_PathOfDestinyOvercome.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/RankManager.java | 2 +- .../SiegeFlagOfProtectionManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../clanhallauction/ClanHallAuction.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad}/ClanHall.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../clientpackets/ExRequestTeleport.java | 2 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../classchange/ExRequestClassChange.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 2 +- .../ranking/ExOlympiadMyRankingInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../ai/areas/Aden/Gallias/Gallias.java | 4 +- .../ai/areas/Aden/Joachim/Joachim.java | 2 +- .../IvoryTower/AvantGarde/AvantGarde.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 4 +- .../ai/areas/TalkingIsland/Hardin/Hardin.java | 2 +- .../MonkOfChaos/MonkOfChaos.java | 2 +- .../ai/areas/TalkingIsland/Raina/Raina.java | 12 +- .../areas/TalkingIsland/Trandon/Trandon.java | 4 +- .../AlchemistManager/AlchemistManager.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../FortressSiegeManager.java | 4 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../ai/others/MentorGuide/MentorGuide.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ai/others/OlyManager/OlyManager.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../FakePlayers/RecieveAdventurerBuffs.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../CastleDungeon/CastleDungeon.java | 2 +- .../EvilIncubator/EvilIncubator.java | 2 +- .../FortressDungeon/FortressDungeon.java | 2 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 4 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00512_BladeUnderFoot.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 2 +- .../Q11027_PathOfDestinyOvercome.java | 2 +- .../quests/ThirdClassTransferQuest.java | 2 +- .../ProofOfCourage/ProofOfCourage.java | 2 +- .../ProofOfJustice/ProofOfJustice.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/RankManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 4 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/Castle.java | 1250 ------------ .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../gameserver/model/siege/Castle.java | 1250 ++++++++++++ .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../classchange/ExRequestClassChange.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../teleports/ExRequestTeleport.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 2 +- .../ranking/ExOlympiadMyRankingInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../game/data/scripts/ai/bosses/Baium.java | 2 +- .../game/data/scripts/ai/bosses/Core.java | 2 +- .../game/data/scripts/ai/bosses/Gustav.java | 2 +- .../game/data/scripts/ai/bosses/Nurka.java | 2 +- .../game/data/scripts/ai/bosses/Orfen.java | 2 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 2 +- .../Q211_TrialOfTheChallenger.java | 2 +- .../Q212_TrialOfDuty/Q212_TrialOfDuty.java | 2 +- .../Q213_TrialOfTheSeeker.java | 2 +- .../Q214_TrialOfTheScholar.java | 2 +- .../Q215_TrialOfThePilgrim.java | 2 +- .../Q216_TrialOfTheGuildsman.java | 2 +- .../Q223_TestOfTheChampion.java | 2 +- .../Q224_TestOfSagittarius.java | 2 +- .../Q225_TestOfTheSearcher.java | 2 +- .../Q226_TestOfTheHealer.java | 2 +- .../Q227_TestOfTheReformer.java | 2 +- .../Q228_TestOfMagus/Q228_TestOfMagus.java | 2 +- .../Q229_TestOfWitchcraft.java | 2 +- .../Q230_TestOfTheSummoner.java | 2 +- .../Q231_TestOfTheMaestro.java | 2 +- .../Q232_TestOfTheLord.java | 2 +- .../Q233_TestOfTheWarSpirit.java | 2 +- .../Q401_PathToAWarrior.java | 2 +- .../Q402_PathToAHumanKnight.java | 2 +- .../Q403_PathToARogue/Q403_PathToARogue.java | 2 +- .../Q404_PathToAHumanWizard.java | 2 +- .../Q405_PathToACleric.java | 2 +- .../Q406_PathToAnElvenKnight.java | 2 +- .../Q407_PathToAnElvenScout.java | 2 +- .../Q408_PathToAnElvenWizard.java | 2 +- .../Q409_PathToAnElvenOracle.java | 2 +- .../Q410_PathToAPalusKnight.java | 2 +- .../Q411_PathToAnAssassin.java | 2 +- .../Q412_PathToADarkWizard.java | 2 +- .../Q413_PathToAShillienOracle.java | 2 +- .../Q414_PathToAnOrcRaider.java | 2 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 2 +- .../Q416_PathToAnOrcShaman.java | 2 +- .../Q417_PathToBecomeAScavenger.java | 2 +- .../Q418_PathToAnArtisan.java | 2 +- ...504_CompetitionForTheBanditStronghold.java | 2 +- .../Q505_BloodOffering.java | 2 +- .../HuntingGroundsTeleport.java | 2 +- .../SecondClassChange/SecondClassChange.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 24 +- .../org/l2jmobius/gameserver/Shutdown.java | 8 +- .../Manager/RegionBBSManager.java | 4 +- .../{model/entity => data}/Announcements.java | 2 +- .../gameserver/data/sql/ClanTable.java | 6 +- .../gameserver/data/sql/NpcTable.java | 2 +- .../gameserver/data/sql/SkillTreeTable.java | 2 +- .../gameserver/data/sql/SpawnTable.java | 2 +- .../gameserver/data/xml/DoorData.java | 2 +- .../gameserver/data/xml/MapRegionData.java | 6 +- .../data/xml/PlayerTemplateData.java | 2 +- .../{model/base => enums}/ClassId.java | 4 +- .../{model/base => enums}/ClassLevel.java | 2 +- .../gameserver/enums}/ClassType.java | 2 +- .../{model/base => enums}/PlayerClass.java | 17 +- .../handler/AutoAnnouncementHandler.java | 2 +- .../gameserver/handler/AutoChatHandler.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../AdminAnnouncements.java | 2 +- .../admincommandhandlers/AdminCTFEngine.java | 2 +- .../admincommandhandlers/AdminDMEngine.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 6 +- .../AdminEventEngine.java | 2 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminMammon.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../admincommandhandlers/AdminSiege.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 2 +- .../admincommandhandlers/AdminTownWar.java | 2 +- .../admincommandhandlers/AdminTvTEngine.java | 2 +- .../admincommandhandlers/AdminVIPEngine.java | 2 +- .../handler/itemhandlers/MercTicket.java | 2 +- .../handler/itemhandlers/Potions.java | 8 +- .../handler/itemhandlers/ScrollOfEscape.java | 8 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/SummonItems.java | 6 +- .../handler/skillhandlers/Blow.java | 2 +- .../handler/skillhandlers/ClanGate.java | 2 +- .../handler/skillhandlers/Recall.java | 8 +- .../handler/skillhandlers/SiegeFlag.java | 4 +- .../skillhandlers/StrSiegeAssault.java | 4 +- .../handler/skillhandlers/SummonFriend.java | 8 +- .../handler/skillhandlers/TakeCastle.java | 4 +- .../handler/usercommandhandlers/Escape.java | 8 +- .../usercommandhandlers/OfflineShop.java | 4 +- .../usercommandhandlers/OlympiadStat.java | 2 +- .../handler/voicedcommandhandlers/CTFCmd.java | 2 +- .../voicedcommandhandlers/CastleCmd.java | 2 +- .../handler/voicedcommandhandlers/DMCmd.java | 2 +- .../voicedcommandhandlers/FarmPvpCmd.java | 2 +- .../voicedcommandhandlers/OfflineShop.java | 4 +- .../handler/voicedcommandhandlers/TvTCmd.java | 2 +- .../voicedcommandhandlers/Wedding.java | 8 +- .../instancemanager/AuctionManager.java | 14 +- .../instancemanager/CastleManager.java | 4 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/ChristmasManager.java | 2 +- .../instancemanager/ClanHallManager.java | 2 +- .../instancemanager/CoupleManager.java | 2 +- .../instancemanager/CrownManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../FortSiegeGuardManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../instancemanager/RebirthManager.java | 12 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../event => instancemanager/events}/CTF.java | 9 +- .../event => instancemanager/events}/DM.java | 11 +- .../events}/EventInterface.java | 2 +- .../events}/EventManager.java | 6 +- .../events}/EventPoint.java | 2 +- .../instancemanager/events}/EventTask.java | 2 +- .../events}/EventsGlobalTask.java | 2 +- .../events}/GameEvent.java | 2 +- .../instancemanager/events}/PcPoint.java | 2 +- .../event => instancemanager/events}/TvT.java | 9 +- .../event => instancemanager/events}/VIP.java | 4 +- .../instancemanager/games}/Lottery.java | 4 +- .../instancemanager/games}/MonsterRace.java | 2 +- .../gameserver/model}/DimensionalRift.java | 3 +- .../org/l2jmobius/gameserver/model/Party.java | 3 +- .../org/l2jmobius/gameserver/model/Skill.java | 10 +- .../model/{base => }/SoulCrystal.java | 2 +- .../gameserver/model/{base => }/SubClass.java | 3 +- .../model/{entity => }/Wedding.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Creature.java | 12 +- .../actor/instance/AuctioneerInstance.java | 22 +- .../actor/instance/CabaleBufferInstance.java | 2 +- .../instance/CastleChamberlainInstance.java | 2 +- .../instance/CastleMagicianInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 2 +- .../instance/ClanHallSiegeInfInstance.java | 6 +- .../actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 2 +- .../model/actor/instance/DoorInstance.java | 8 +- .../model/actor/instance/DoormanInstance.java | 2 +- .../actor/instance/FakePlayerInstance.java | 2 +- .../actor/instance/FestivalGuideInstance.java | 4 +- .../instance/FestivalMonsterInstance.java | 2 +- .../model/actor/instance/FolkInstance.java | 2 +- .../actor/instance/FortMerchantInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 22 +- .../instance/OlympiadManagerInstance.java | 2 +- .../model/actor/instance/PetInstance.java | 2 +- .../model/actor/instance/PlayerInstance.java | 36 +- .../actor/instance/RaceManagerInstance.java | 6 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/SiegeGuardInstance.java | 2 +- .../actor/instance/SiegeNpcInstance.java | 2 +- .../actor/instance/SignsPriestInstance.java | 2 +- .../model/actor/instance/SummonInstance.java | 2 +- .../actor/instance/TeleporterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 14 +- .../instance/WeddingManagerInstance.java | 4 +- .../actor/instance/WyvernManagerInstance.java | 2 +- .../actor/knownlist/RaceManagerKnownList.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/{entity => olympiad}/Hero.java | 3 +- .../model/{entity => }/olympiad/Olympiad.java | 5 +- .../{entity => }/olympiad/OlympiadGame.java | 4 +- .../olympiad/OlympiadManager.java | 4 +- .../{entity => }/olympiad/OlympiadPeriod.java | 2 +- .../olympiad/OlympiadStadium.java | 2 +- .../model/residences}/ClanHall.java | 2 +- .../ClanHallAuction.java} | 10 +- .../{entity => }/sevensigns/SevenSigns.java | 2 +- .../model}/sevensigns/SevenSignsFestival.java | 2 +- .../model/{entity => }/siege/Castle.java | 6 +- .../{entity => }/siege/CastleUpdater.java | 2 +- .../model}/siege/ClanHallSiege.java | 2 +- .../model/{entity => }/siege/Fort.java | 6 +- .../model/{entity => }/siege/FortSiege.java | 4 +- .../model/{entity => }/siege/Siege.java | 4 +- .../clanhalls/BanditStrongholdSiege.java | 6 +- .../siege/clanhalls/DevastatedCastle.java | 6 +- .../siege/clanhalls/FortressOfResistance.java | 4 +- .../siege/clanhalls/WildBeastFarmSiege.java | 6 +- .../gameserver/model/skills/Formulas.java | 8 +- .../gameserver/model/spawn/AutoSpawn.java | 2 +- .../model/zone/type/CastleTeleportZone.java | 2 +- .../model/zone/type/CastleZone.java | 2 +- .../model/zone/type/ClanHallZone.java | 2 +- .../gameserver/model/zone/type/FortZone.java | 2 +- .../gameserver/network/GameClient.java | 12 +- .../network/clientpackets/AttackRequest.java | 6 +- .../network/clientpackets/EnterWorld.java | 30 +- .../network/clientpackets/Logout.java | 4 +- .../network/clientpackets/NewCharacter.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 16 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 +- .../clientpackets/RequestJoinSiege.java | 4 +- .../RequestOlympiadMatchList.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSSQStatus.java | 2 +- .../RequestSiegeAttackerList.java | 4 +- .../RequestSiegeDefenderList.java | 4 +- .../serverpackets/ClanHallDecoration.java | 4 +- .../gameserver/network/serverpackets/Die.java | 10 +- .../network/serverpackets/ExHeroList.java | 4 +- .../serverpackets/ExShowCropSetting.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowSeedSetting.java | 2 +- .../serverpackets/FortSiegeAttackerList.java | 2 +- .../serverpackets/FortSiegeDefenderList.java | 2 +- .../serverpackets/FortressSiegeInfo.java | 2 +- .../network/serverpackets/SSQStatus.java | 4 +- .../network/serverpackets/ShowMiniMap.java | 2 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/SignsSky.java | 2 +- .../script/faenor/FaenorInterface.java | 2 +- .../taskmanager/tasks/TaskOlympiadSave.java | 2 +- .../tasks/TaskSevenSignsUpdate.java | 4 +- .../l2jmobius/telnet/GameStatusThread.java | 2 +- .../game/data/scripts/ai/bosses/Baium.java | 2 +- .../game/data/scripts/ai/bosses/Core.java | 2 +- .../game/data/scripts/ai/bosses/Gustav.java | 2 +- .../game/data/scripts/ai/bosses/Nurka.java | 2 +- .../game/data/scripts/ai/bosses/Orfen.java | 2 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 2 +- .../Q211_TrialOfTheChallenger.java | 2 +- .../Q212_TrialOfDuty/Q212_TrialOfDuty.java | 2 +- .../Q213_TrialOfTheSeeker.java | 2 +- .../Q214_TrialOfTheScholar.java | 2 +- .../Q215_TrialOfThePilgrim.java | 2 +- .../Q216_TrialOfTheGuildsman.java | 2 +- .../Q223_TestOfTheChampion.java | 2 +- .../Q224_TestOfSagittarius.java | 2 +- .../Q225_TestOfTheSearcher.java | 2 +- .../Q226_TestOfTheHealer.java | 2 +- .../Q227_TestOfTheReformer.java | 2 +- .../Q228_TestOfMagus/Q228_TestOfMagus.java | 2 +- .../Q229_TestOfWitchcraft.java | 2 +- .../Q230_TestOfTheSummoner.java | 2 +- .../Q231_TestOfTheMaestro.java | 2 +- .../Q232_TestOfTheLord.java | 2 +- .../Q233_TestOfTheWarSpirit.java | 2 +- .../Q401_PathToAWarrior.java | 2 +- .../Q402_PathToAHumanKnight.java | 2 +- .../Q403_PathToARogue/Q403_PathToARogue.java | 2 +- .../Q404_PathToAHumanWizard.java | 2 +- .../Q405_PathToACleric.java | 2 +- .../Q406_PathToAnElvenKnight.java | 2 +- .../Q407_PathToAnElvenScout.java | 2 +- .../Q408_PathToAnElvenWizard.java | 2 +- .../Q409_PathToAnElvenOracle.java | 2 +- .../Q410_PathToAPalusKnight.java | 2 +- .../Q411_PathToAnAssassin.java | 2 +- .../Q412_PathToADarkWizard.java | 2 +- .../Q413_PathToAShillienOracle.java | 2 +- .../Q414_PathToAnOrcRaider.java | 2 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 2 +- .../Q416_PathToAnOrcShaman.java | 2 +- .../Q417_PathToBecomeAScavenger.java | 2 +- .../Q418_PathToAnArtisan.java | 2 +- ...504_CompetitionForTheBanditStronghold.java | 2 +- .../Q505_BloodOffering.java | 2 +- .../HuntingGroundsTeleport.java | 2 +- .../SecondClassChange/SecondClassChange.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 24 +- .../org/l2jmobius/gameserver/Shutdown.java | 8 +- .../Manager/RegionBBSManager.java | 4 +- .../{model/entity => data}/Announcements.java | 2 +- .../gameserver/data/sql/ClanTable.java | 6 +- .../gameserver/data/sql/NpcTable.java | 2 +- .../gameserver/data/sql/SkillTreeTable.java | 2 +- .../gameserver/data/sql/SpawnTable.java | 2 +- .../gameserver/data/xml/DoorData.java | 2 +- .../gameserver/data/xml/MapRegionData.java | 6 +- .../data/xml/PlayerTemplateData.java | 2 +- .../{model/base => enums}/ClassId.java | 4 +- .../{model/base => enums}/ClassLevel.java | 2 +- .../gameserver/enums}/ClassType.java | 2 +- .../{model/base => enums}/PlayerClass.java | 17 +- .../handler/AutoAnnouncementHandler.java | 2 +- .../gameserver/handler/AutoChatHandler.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../AdminAnnouncements.java | 2 +- .../admincommandhandlers/AdminCTFEngine.java | 2 +- .../admincommandhandlers/AdminDMEngine.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 6 +- .../AdminEventEngine.java | 2 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminMammon.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../admincommandhandlers/AdminSiege.java | 4 +- .../admincommandhandlers/AdminSpawn.java | 2 +- .../admincommandhandlers/AdminTownWar.java | 2 +- .../admincommandhandlers/AdminTvTEngine.java | 2 +- .../admincommandhandlers/AdminVIPEngine.java | 2 +- .../handler/itemhandlers/MercTicket.java | 2 +- .../handler/itemhandlers/Potions.java | 8 +- .../handler/itemhandlers/ScrollOfEscape.java | 8 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/SummonItems.java | 6 +- .../handler/skillhandlers/Blow.java | 2 +- .../handler/skillhandlers/ClanGate.java | 2 +- .../handler/skillhandlers/Recall.java | 8 +- .../handler/skillhandlers/SiegeFlag.java | 4 +- .../skillhandlers/StrSiegeAssault.java | 4 +- .../handler/skillhandlers/SummonFriend.java | 8 +- .../handler/skillhandlers/TakeCastle.java | 4 +- .../handler/usercommandhandlers/Escape.java | 8 +- .../usercommandhandlers/OfflineShop.java | 4 +- .../usercommandhandlers/OlympiadStat.java | 2 +- .../handler/voicedcommandhandlers/CTFCmd.java | 2 +- .../voicedcommandhandlers/CastleCmd.java | 2 +- .../handler/voicedcommandhandlers/DMCmd.java | 2 +- .../voicedcommandhandlers/FarmPvpCmd.java | 2 +- .../voicedcommandhandlers/OfflineShop.java | 4 +- .../handler/voicedcommandhandlers/TvTCmd.java | 2 +- .../voicedcommandhandlers/Wedding.java | 8 +- .../instancemanager/AuctionManager.java | 14 +- .../instancemanager/CastleManager.java | 4 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/ChristmasManager.java | 2 +- .../instancemanager/ClanHallManager.java | 2 +- .../instancemanager/CoupleManager.java | 2 +- .../instancemanager/CrownManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../FortSiegeGuardManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RaidBossSpawnManager.java | 2 +- .../instancemanager/RebirthManager.java | 12 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../event => instancemanager/events}/CTF.java | 9 +- .../event => instancemanager/events}/DM.java | 11 +- .../events}/EventInterface.java | 2 +- .../events}/EventManager.java | 6 +- .../events}/EventPoint.java | 2 +- .../instancemanager/events}/EventTask.java | 2 +- .../events}/EventsGlobalTask.java | 2 +- .../events}/GameEvent.java | 2 +- .../instancemanager/events}/PcPoint.java | 2 +- .../event => instancemanager/events}/TvT.java | 9 +- .../event => instancemanager/events}/VIP.java | 4 +- .../instancemanager/games}/Lottery.java | 4 +- .../instancemanager/games}/MonsterRace.java | 2 +- .../gameserver/model/CursedWeapon.java | 6 +- .../gameserver/model}/DimensionalRift.java | 3 +- .../gameserver/model/{entity => }/Duel.java | 5 +- .../org/l2jmobius/gameserver/model/Party.java | 3 +- .../org/l2jmobius/gameserver/model/Skill.java | 10 +- .../model/{base => }/SoulCrystal.java | 2 +- .../gameserver/model/{base => }/SubClass.java | 3 +- .../model/{entity => }/Wedding.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Creature.java | 14 +- .../actor/instance/AuctioneerInstance.java | 22 +- .../actor/instance/CabaleBufferInstance.java | 2 +- .../instance/CastleChamberlainInstance.java | 2 +- .../instance/CastleMagicianInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 2 +- .../instance/ClanHallSiegeInfInstance.java | 6 +- .../actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 2 +- .../model/actor/instance/DoorInstance.java | 8 +- .../model/actor/instance/DoormanInstance.java | 2 +- .../actor/instance/FakePlayerInstance.java | 2 +- .../actor/instance/FestivalGuideInstance.java | 4 +- .../instance/FestivalMonsterInstance.java | 2 +- .../model/actor/instance/FolkInstance.java | 2 +- .../actor/instance/FortMerchantInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 22 +- .../instance/OlympiadManagerInstance.java | 2 +- .../model/actor/instance/PetInstance.java | 2 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/RaceManagerInstance.java | 6 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/SiegeGuardInstance.java | 2 +- .../actor/instance/SiegeNpcInstance.java | 2 +- .../actor/instance/SignsPriestInstance.java | 2 +- .../model/actor/instance/SummonInstance.java | 2 +- .../actor/instance/TeleporterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 14 +- .../instance/WeddingManagerInstance.java | 4 +- .../actor/instance/WyvernManagerInstance.java | 2 +- .../actor/knownlist/RaceManagerKnownList.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/status/CreatureStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/{entity => olympiad}/Hero.java | 3 +- .../model/{entity => }/olympiad/Olympiad.java | 5 +- .../{entity => }/olympiad/OlympiadGame.java | 4 +- .../olympiad/OlympiadManager.java | 4 +- .../{entity => }/olympiad/OlympiadPeriod.java | 2 +- .../olympiad/OlympiadStadium.java | 2 +- .../model/residences}/ClanHall.java | 2 +- .../ClanHallAuction.java} | 10 +- .../{entity => }/sevensigns/SevenSigns.java | 2 +- .../model}/sevensigns/SevenSignsFestival.java | 2 +- .../model/{entity => }/siege/Castle.java | 6 +- .../{entity => }/siege/CastleUpdater.java | 2 +- .../model}/siege/ClanHallSiege.java | 2 +- .../model/{entity => }/siege/Fort.java | 6 +- .../model/{entity => }/siege/FortSiege.java | 4 +- .../model/{entity => }/siege/Siege.java | 4 +- .../clanhalls/BanditStrongholdSiege.java | 6 +- .../siege/clanhalls/DevastatedCastle.java | 6 +- .../siege/clanhalls/FortressOfResistance.java | 4 +- .../siege/clanhalls/WildBeastFarmSiege.java | 6 +- .../gameserver/model/skills/Formulas.java | 8 +- .../gameserver/model/spawn/AutoSpawn.java | 2 +- .../model/zone/type/CastleTeleportZone.java | 2 +- .../model/zone/type/CastleZone.java | 2 +- .../model/zone/type/ClanHallZone.java | 2 +- .../gameserver/model/zone/type/FortZone.java | 2 +- .../gameserver/network/GameClient.java | 12 +- .../network/clientpackets/AttackRequest.java | 6 +- .../network/clientpackets/EnterWorld.java | 30 +- .../network/clientpackets/Logout.java | 4 +- .../network/clientpackets/NewCharacter.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 16 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 +- .../clientpackets/RequestJoinSiege.java | 4 +- .../RequestOlympiadMatchList.java | 2 +- .../network/clientpackets/RequestRestart.java | 4 +- .../clientpackets/RequestRestartPoint.java | 12 +- .../clientpackets/RequestSSQStatus.java | 2 +- .../RequestSiegeAttackerList.java | 4 +- .../RequestSiegeDefenderList.java | 4 +- .../serverpackets/ClanHallDecoration.java | 4 +- .../gameserver/network/serverpackets/Die.java | 10 +- .../network/serverpackets/ExHeroList.java | 4 +- .../serverpackets/ExShowCropSetting.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowSeedSetting.java | 2 +- .../serverpackets/FortSiegeAttackerList.java | 2 +- .../serverpackets/FortSiegeDefenderList.java | 2 +- .../serverpackets/FortressSiegeInfo.java | 2 +- .../network/serverpackets/SSQStatus.java | 4 +- .../network/serverpackets/ShowMiniMap.java | 2 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/SignsSky.java | 2 +- .../script/faenor/FaenorInterface.java | 2 +- .../taskmanager/tasks/TaskOlympiadSave.java | 2 +- .../tasks/TaskSevenSignsUpdate.java | 4 +- .../l2jmobius/telnet/GameStatusThread.java | 2 +- .../AI/Zones/BaseTower/BaseTower.java | 2 +- .../AI/Zones/TullyWorkshop/TullyWorkshop.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 8 +- .../CastleMercenaryManager.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../FortressSiegeManager.java | 4 +- .../GatekeeperSpirit/GatekeeperSpirit.java | 2 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../HuntingGroundsTeleport.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../others/NpcBuffers/impl/CabaleBuffer.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 6 +- .../DevastatedCastle/DevastatedCastle.java | 2 +- .../FortressOfResistance.java | 2 +- .../FortressOfTheDead/FortressOfTheDead.java | 2 +- .../RainbowSpringsChateau.java | 6 +- .../conquerablehalls/flagwar/FlagWar.java | 6 +- .../events/TvT/TvTManager/TvTManager.java | 2 +- .../custom/events/Wedding/Wedding.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../actionhandlers/PlayerInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCHSiege.java | 4 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminMammon.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../admincommandhandlers/AdminSiege.java | 8 +- .../admincommandhandlers/AdminSpawn.java | 2 +- .../admincommandhandlers/AdminTvTEvent.java | 6 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/bypasshandlers/Festival.java | 4 +- .../handlers/bypasshandlers/SkillList.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../punishmenthandlers/JailHandler.java | 2 +- .../scripts/handlers/targethandlers/Clan.java | 2 +- .../handlers/targethandlers/CorpseClan.java | 2 +- .../handlers/targethandlers/PartyClan.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../handlers/usercommandhandlers/Unstuck.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../voicedcommandhandlers/Wedding.java | 6 +- .../CastleDungeon/CastleDungeon.java | 4 +- .../Q00060_GoodWorksReward.java | 2 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00062_PathOfTheTrooper.java | 2 +- .../Q00063_PathOfTheWarder.java | 2 +- .../Q00064_CertifiedBerserker.java | 2 +- .../Q00066_CertifiedArbalester.java | 2 +- .../Q00178_IconicTrinity.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00226_TestOfTheHealer.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00348_AnArrogantSearch.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- ...504_CompetitionForTheBanditStronghold.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00655_AGrandPlanForTamingWildBeasts.java | 4 +- .../Q00708_PathToBecomingALordGludio.java | 4 +- .../Q00709_PathToBecomingALordDion.java | 4 +- .../Q00710_PathToBecomingALordGiran.java | 4 +- .../Q00711_PathToBecomingALordInnadril.java | 4 +- .../Q00712_PathToBecomingALordOren.java | 4 +- .../Q00713_PathToBecomingALordAden.java | 4 +- .../Q00714_PathToBecomingALordSchuttgart.java | 4 +- .../Q00715_PathToBecomingALordGoddard.java | 4 +- .../Q00716_PathToBecomingALordRune.java | 4 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 4 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../KamaelChange1/KamaelChange1.java | 2 +- .../KamaelChange2/KamaelChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 6 +- .../org/l2jmobius/gameserver/Shutdown.java | 4 +- .../org/l2jmobius/gameserver/ai/PlayerAI.java | 2 +- .../data/MerchantPriceConfigTable.java | 2 +- .../gameserver/data/sql/ClanTable.java | 12 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../gameserver/data/xml/NpcData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillLearnData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 10 +- .../base => enums}/AcquireSkillType.java | 2 +- .../{model/base => enums}/ClassId.java | 3 +- .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CHSiegeManager.java | 4 +- .../instancemanager/CastleManager.java | 4 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 14 +- .../instancemanager/ClanHallManager.java | 6 +- .../instancemanager/CoupleManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../FortSiegeGuardManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 10 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/TerritoryWarManager.java | 6 +- .../instancemanager/TownManager.java | 2 +- .../events}/GameEvent.java | 2 +- .../events}/TvTEvent.java | 2 +- .../events}/TvTEventListener.java | 2 +- .../events}/TvTEventPlayer.java | 2 +- .../events}/TvTEventTeam.java | 2 +- .../events}/TvTEventTeleporter.java | 3 +- .../events}/TvTManager.java | 2 +- .../games/BlockChecker.java} | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../gameserver/model}/DimensionalRift.java | 4 +- .../gameserver/model/{entity => }/Duel.java | 3 +- .../model/{entity => }/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 3 +- .../model/{entity => }/RecoBonus.java | 2 +- .../gameserver/model/SkillLearn.java | 4 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/instance/AuctioneerInstance.java | 22 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/CastleDoormanInstance.java | 2 +- .../instance/ClanHallDoormanInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 6 +- .../actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 4 +- .../actor/instance/DawnPriestInstance.java | 2 +- .../actor/instance/DefenderInstance.java | 6 +- .../model/actor/instance/DoorInstance.java | 8 +- .../instance/DungeonGatekeeperInstance.java | 2 +- .../actor/instance/DuskPriestInstance.java | 2 +- .../actor/instance/FestivalGuideInstance.java | 4 +- .../instance/FestivalMonsterInstance.java | 2 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 2 +- .../actor/instance/GrandBossInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 34 +- .../actor/instance/RaidBossInstance.java | 2 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/SignsPriestInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterKamaelInstance.java | 2 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 6 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerTvTEvent.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../events/impl/events/OnTvTEventKill.java | 2 +- .../sieges/castle/OnCastleSiegeFinish.java | 2 +- .../castle/OnCastleSiegeOwnerChange.java | 2 +- .../sieges/castle/OnCastleSiegeStart.java | 2 +- .../impl/sieges/fort/OnFortSiegeFinish.java | 2 +- .../impl/sieges/fort/OnFortSiegeStart.java | 2 +- .../ClassInfoHolder.java} | 8 +- .../SubClassHolder.java} | 11 +- .../gameserver/model/items/Henna.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../AbstractResidence.java | 2 +- .../AuctionableHall.java | 3 +- .../{entity => residences}/ClanHall.java | 2 +- .../ClanHallAuction.java} | 10 +- .../{ => model/sevensigns}/SevenSigns.java | 4 +- .../sevensigns}/SevenSignsFestival.java | 2 +- .../model/{entity => siege}/Castle.java | 3 +- .../model/{entity => siege}/Fort.java | 3 +- .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../clanhalls}/ClanHallSiegeEngine.java | 4 +- .../clanhalls}/SiegableHall.java | 4 +- .../clanhalls}/SiegeStatus.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/stats/Formulas.java | 12 +- .../functions/formulas/FuncGatesMDefMod.java | 2 +- .../functions/formulas/FuncGatesPDefMod.java | 2 +- .../model/zone/type/ClanHallZone.java | 4 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 8 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 18 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 4 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../clientpackets/RequestRestartPoint.java | 8 +- .../clientpackets/RequestSSQStatus.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 4 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/AcquireSkillList.java | 2 +- .../network/serverpackets/AgitDecoInfo.java | 6 +- .../gameserver/network/serverpackets/Die.java | 6 +- .../network/serverpackets/ExHeroList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/SSQInfo.java | 2 +- .../network/serverpackets/SSQStatus.java | 4 +- .../network/serverpackets/ShowMiniMap.java | 2 +- .../serverpackets/SiegeAttackerList.java | 4 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 4 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../tasks/TaskSevenSignsUpdate.java | 4 +- .../gameserver/util/DocumentBase.java | 2 +- .../ai/areas/DragonValley/DragonValley.java | 2 +- .../AI/Zones/BaseTower/BaseTower.java | 2 +- .../AI/Zones/TullyWorkshop/TullyWorkshop.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 2 +- .../CastleAmbassador/CastleAmbassador.java | 4 +- .../CastleChamberlain/CastleChamberlain.java | 8 +- .../CastleMercenaryManager.java | 4 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../FortressSiegeManager.java | 4 +- .../GatekeeperSpirit/GatekeeperSpirit.java | 2 +- .../others/HealerTrainer/HealerTrainer.java | 2 +- .../HuntingGroundsTeleport.java | 2 +- .../others/NpcBuffers/impl/CabaleBuffer.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 6 +- .../DevastatedCastle/DevastatedCastle.java | 2 +- .../FortressOfResistance.java | 2 +- .../FortressOfTheDead/FortressOfTheDead.java | 2 +- .../RainbowSpringsChateau.java | 6 +- .../conquerablehalls/flagwar/FlagWar.java | 6 +- .../events/TvT/TvTManager/TvTManager.java | 2 +- .../custom/events/Wedding/Wedding.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../actionhandlers/PlayerInstanceAction.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCHSiege.java | 4 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminMammon.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../admincommandhandlers/AdminSiege.java | 8 +- .../admincommandhandlers/AdminSpawn.java | 2 +- .../admincommandhandlers/AdminTvTEvent.java | 6 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/bypasshandlers/Festival.java | 4 +- .../bypasshandlers/OlympiadManagerLink.java | 2 +- .../handlers/bypasshandlers/SkillList.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../punishmenthandlers/JailHandler.java | 2 +- .../scripts/handlers/targethandlers/Clan.java | 2 +- .../handlers/targethandlers/CorpseClan.java | 2 +- .../handlers/targethandlers/PartyClan.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../handlers/usercommandhandlers/Unstuck.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../voicedcommandhandlers/Wedding.java | 6 +- .../CastleDungeon/CastleDungeon.java | 4 +- .../Q00060_GoodWorksReward.java | 2 +- .../Q00061_LawEnforcement.java | 2 +- .../Q00062_PathOfTheTrooper.java | 2 +- .../Q00063_PathOfTheWarder.java | 2 +- .../Q00064_CertifiedBerserker.java | 2 +- .../Q00066_CertifiedArbalester.java | 2 +- .../Q00178_IconicTrinity.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00226_TestOfTheHealer.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00348_AnArrogantSearch.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- ...504_CompetitionForTheBanditStronghold.java | 2 +- .../Q00511_AwlUnderFoot.java | 2 +- .../Q00655_AGrandPlanForTamingWildBeasts.java | 4 +- .../Q00708_PathToBecomingALordGludio.java | 4 +- .../Q00709_PathToBecomingALordDion.java | 4 +- .../Q00710_PathToBecomingALordGiran.java | 4 +- .../Q00711_PathToBecomingALordInnadril.java | 4 +- .../Q00712_PathToBecomingALordOren.java | 4 +- .../Q00713_PathToBecomingALordAden.java | 4 +- .../Q00714_PathToBecomingALordSchuttgart.java | 4 +- .../Q00715_PathToBecomingALordGoddard.java | 4 +- .../Q00716_PathToBecomingALordRune.java | 4 +- .../Q00726_LightWithinTheDarkness.java | 2 +- .../Q00727_HopeWithinTheDarkness.java | 4 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../KamaelChange1/KamaelChange1.java | 2 +- .../KamaelChange2/KamaelChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 6 +- .../org/l2jmobius/gameserver/Shutdown.java | 4 +- .../org/l2jmobius/gameserver/ai/PlayerAI.java | 2 +- .../data/MerchantPriceConfigTable.java | 2 +- .../gameserver/data/sql/ClanTable.java | 12 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../gameserver/data/xml/NpcData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillLearnData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 10 +- .../base => enums}/AcquireSkillType.java | 2 +- .../{model/base => enums}/ClassId.java | 3 +- .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CHSiegeManager.java | 4 +- .../instancemanager/CastleManager.java | 4 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 14 +- .../instancemanager/ClanHallManager.java | 6 +- .../instancemanager/CoupleManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../FortSiegeGuardManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 10 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/TerritoryWarManager.java | 6 +- .../instancemanager/TownManager.java | 2 +- .../events}/GameEvent.java | 2 +- .../events}/TvTEvent.java | 2 +- .../events}/TvTEventListener.java | 2 +- .../events}/TvTEventPlayer.java | 2 +- .../events}/TvTEventTeam.java | 2 +- .../events}/TvTEventTeleporter.java | 3 +- .../events}/TvTManager.java | 2 +- .../games/BlockChecker.java} | 8 +- .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../gameserver/model}/DimensionalRift.java | 4 +- .../gameserver/model/{entity => }/Duel.java | 3 +- .../model/{entity => }/Message.java | 2 +- .../{entity/NevitSystem.java => Nevit.java} | 6 +- .../org/l2jmobius/gameserver/model/Party.java | 3 +- .../model/{entity => }/RecoBonus.java | 2 +- .../gameserver/model/SkillLearn.java | 4 +- .../l2jmobius/gameserver/model/actor/Npc.java | 10 +- .../actor/instance/AuctioneerInstance.java | 22 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/CastleDoormanInstance.java | 2 +- .../instance/ClanHallDoormanInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 6 +- .../actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 4 +- .../actor/instance/DawnPriestInstance.java | 2 +- .../actor/instance/DefenderInstance.java | 6 +- .../model/actor/instance/DoorInstance.java | 8 +- .../instance/DungeonGatekeeperInstance.java | 2 +- .../actor/instance/DuskPriestInstance.java | 2 +- .../actor/instance/FestivalGuideInstance.java | 4 +- .../instance/FestivalMonsterInstance.java | 2 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 2 +- .../actor/instance/GrandBossInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 40 +- .../actor/instance/RaidBossInstance.java | 2 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../actor/instance/SignsPriestInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterKamaelInstance.java | 2 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 6 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerTvTEvent.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../events/impl/events/OnTvTEventKill.java | 2 +- .../sieges/castle/OnCastleSiegeFinish.java | 2 +- .../castle/OnCastleSiegeOwnerChange.java | 2 +- .../sieges/castle/OnCastleSiegeStart.java | 2 +- .../impl/sieges/fort/OnFortSiegeFinish.java | 2 +- .../impl/sieges/fort/OnFortSiegeStart.java | 2 +- .../ClassInfoHolder.java} | 8 +- .../SubClassHolder.java} | 11 +- .../gameserver/model/items/Henna.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 1 - .../gameserver/model/quest/Quest.java | 4 +- .../AbstractResidence.java | 2 +- .../AuctionableHall.java | 3 +- .../{entity => residences}/ClanHall.java | 2 +- .../ClanHallAuction.java} | 10 +- .../{ => model/sevensigns}/SevenSigns.java | 4 +- .../sevensigns}/SevenSignsFestival.java | 2 +- .../model/{entity => siege}/Castle.java | 3 +- .../model/{entity => siege}/Fort.java | 3 +- .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../clanhalls}/ClanHallSiegeEngine.java | 4 +- .../clanhalls}/SiegableHall.java | 4 +- .../clanhalls}/SiegeStatus.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/stats/Formulas.java | 12 +- .../functions/formulas/FuncGatesMDefMod.java | 2 +- .../functions/formulas/FuncGatesPDefMod.java | 2 +- .../model/zone/type/ClanHallZone.java | 4 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 8 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 18 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 4 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../clientpackets/RequestRestartPoint.java | 8 +- .../clientpackets/RequestSSQStatus.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 4 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/AcquireSkillList.java | 2 +- .../network/serverpackets/AgitDecoInfo.java | 6 +- .../gameserver/network/serverpackets/Die.java | 6 +- .../network/serverpackets/ExHeroList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/SSQInfo.java | 2 +- .../network/serverpackets/SSQStatus.java | 4 +- .../network/serverpackets/ShowMiniMap.java | 2 +- .../serverpackets/SiegeAttackerList.java | 4 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 4 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../tasks/TaskSevenSignsUpdate.java | 4 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../Q10993_FutureDwarves.java | 2 +- .../Q10994_FutureOrcs/Q10994_FutureOrcs.java | 2 +- .../Q11006_FuturePeople.java | 2 +- .../Q11012_FutureElves.java | 2 +- .../Q11018_FutureDarkElves.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../Q10993_FutureDwarves.java | 2 +- .../Q10994_FutureOrcs/Q10994_FutureOrcs.java | 2 +- .../Q11006_FuturePeople.java | 2 +- .../Q11012_FutureElves.java | 2 +- .../Q11018_FutureDarkElves.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../Q10993_FutureDwarves.java | 2 +- .../Q10994_FutureOrcs/Q10994_FutureOrcs.java | 2 +- .../Q11006_FuturePeople.java | 2 +- .../Q11012_FutureElves.java | 2 +- .../Q11018_FutureDarkElves.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../Q10993_FutureDwarves.java | 2 +- .../Q10994_FutureOrcs/Q10994_FutureOrcs.java | 2 +- .../Q11006_FuturePeople.java | 2 +- .../Q11012_FutureElves.java | 2 +- .../Q11018_FutureDarkElves.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/Castle.java | 1243 ------------ .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../gameserver/model/entity/Siege.java | 1735 ---------------- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../gameserver/model/siege/Castle.java | 1243 ++++++++++++ .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege/Siege.java | 1736 +++++++++++++++++ .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../{model/base => enums}/ClassId.java | 3 +- .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/RankManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/Castle.java | 1243 ------------ .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../gameserver/model/entity/Siege.java | 1735 ---------------- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../ClassInfoHolder.java} | 8 +- .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../gameserver/model/siege/Castle.java | 1243 ++++++++++++ .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege/Siege.java | 1736 +++++++++++++++++ .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../clientpackets/ExRequestTeleport.java | 2 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../classchange/ExRequestClassChange.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 2 +- .../ranking/ExOlympiadMyRankingInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../Q00070_SagaOfThePhoenixKnight.java | 2 +- .../Q00071_SagaOfEvasTemplar.java | 2 +- .../Q00072_SagaOfTheSwordMuse.java | 2 +- .../Q00073_SagaOfTheDuelist.java | 2 +- .../Q00074_SagaOfTheDreadnought.java | 2 +- .../Q00075_SagaOfTheTitan.java | 2 +- .../Q00076_SagaOfTheGrandKhavatari.java | 2 +- .../Q00077_SagaOfTheDominator.java | 2 +- .../Q00078_SagaOfTheDoomcryer.java | 2 +- .../Q00079_SagaOfTheAdventurer.java | 2 +- .../Q00080_SagaOfTheWindRider.java | 2 +- .../Q00081_SagaOfTheGhostHunter.java | 2 +- .../Q00082_SagaOfTheSagittarius.java | 2 +- .../Q00083_SagaOfTheMoonlightSentinel.java | 2 +- .../Q00084_SagaOfTheGhostSentinel.java | 2 +- .../Q00085_SagaOfTheCardinal.java | 2 +- .../Q00086_SagaOfTheHierophant.java | 2 +- .../Q00087_SagaOfEvasSaint.java | 2 +- .../Q00088_SagaOfTheArchmage.java | 2 +- .../Q00089_SagaOfTheMysticMuse.java | 2 +- .../Q00090_SagaOfTheStormScreamer.java | 2 +- .../Q00091_SagaOfTheArcanaLord.java | 2 +- .../Q00092_SagaOfTheElementalMaster.java | 2 +- .../Q00093_SagaOfTheSpectralMaster.java | 2 +- .../Q00094_SagaOfTheSoultaker.java | 2 +- .../Q00095_SagaOfTheHellKnight.java | 2 +- .../Q00096_SagaOfTheSpectralDancer.java | 2 +- .../Q00097_SagaOfTheShillienTemplar.java | 2 +- .../Q00098_SagaOfTheShillienSaint.java | 2 +- .../Q00099_SagaOfTheFortuneSeeker.java | 2 +- .../Q00100_SagaOfTheMaestro.java | 2 +- .../Q00213_TrialOfTheSeeker.java | 2 +- .../Q00214_TrialOfTheScholar.java | 2 +- .../Q00216_TrialOfTheGuildsman.java | 2 +- .../Q00222_TestOfTheDuelist.java | 2 +- .../Q00223_TestOfTheChampion.java | 2 +- .../Q00224_TestOfSagittarius.java | 2 +- .../Q00225_TestOfTheSearcher.java | 2 +- .../Q00227_TestOfTheReformer.java | 2 +- .../Q00228_TestOfMagus.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00230_TestOfTheSummoner.java | 2 +- .../Q00231_TestOfTheMaestro.java | 2 +- .../Q00232_TestOfTheLord.java | 2 +- .../Q00233_TestOfTheWarSpirit.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00402_PathOfTheHumanKnight.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00404_PathOfTheHumanWizard.java | 2 +- .../Q00405_PathOfTheCleric.java | 2 +- .../Q00406_PathOfTheElvenKnight.java | 2 +- .../Q00407_PathOfTheElvenScout.java | 2 +- .../Q00408_PathOfTheElvenWizard.java | 2 +- .../Q00409_PathOfTheElvenOracle.java | 2 +- .../Q00410_PathOfThePalusKnight.java | 2 +- .../Q00411_PathOfTheAssassin.java | 2 +- .../Q00412_PathOfTheDarkWizard.java | 2 +- .../Q00413_PathOfTheShillienOracle.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 2 +- .../Q00416_PathOfTheOrcShaman.java | 2 +- .../Q00417_PathOfTheScavenger.java | 2 +- .../Q00418_PathOfTheArtisan.java | 2 +- .../Q10993_FutureDwarves.java | 2 +- .../Q10994_FutureOrcs/Q10994_FutureOrcs.java | 2 +- .../Q11006_FuturePeople.java | 2 +- .../Q11012_FutureElves.java | 2 +- .../Q11018_FutureDarkElves.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../l2jmobius/gameserver/enums/ClassId.java | 393 ++++ .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../org/l2jmobius/gameserver/model/Duel.java | 1070 ++++++++++ .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/ClassId.java | 394 ---- .../gameserver/model/base/ClassInfo.java | 116 -- .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../gameserver/model/base/SubClass.java | 141 -- .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/Castle.java | 1243 ------------ .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Duel.java | 1071 ---------- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/FortSiege.java | 1319 ------------- .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Hero.java | 939 --------- .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../gameserver/model/entity/Siege.java | 1735 ---------------- .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../model/holders/ClassInfoHolder.java | 118 ++ .../model/holders/SubClassHolder.java | 142 ++ .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../gameserver/model/olympiad/Hero.java | 939 +++++++++ .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../gameserver/model/siege/Castle.java | 1243 ++++++++++++ .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../gameserver/model/siege/FortSiege.java | 1319 +++++++++++++ .../gameserver/model/siege/Siegable.java | 67 + .../gameserver/model/siege/Siege.java | 1736 +++++++++++++++++ .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 6 +- .../CastleDoorManager/CastleDoorManager.java | 2 +- .../CastleMercenaryManager.java | 2 +- .../scripts/ai/others/CastleSideEffect.java | 2 +- .../CastleTeleporter/CastleTeleporter.java | 2 +- .../ClanHallAuctioneer.java | 6 +- .../ClanHallDoorManager.java | 2 +- .../ClanHallManager/ClanHallManager.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 2 +- .../MonumentOfHeroes/MonumentOfHeroes.java | 2 +- .../ProvisionalHalls/ProvisionalHalls.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 +- .../others/WyvernManager/WyvernManager.java | 2 +- .../actionhandlers/DoorInstanceAction.java | 2 +- .../actionhandlers/ItemInstanceAction.java | 2 +- .../handlers/actionhandlers/NpcAction.java | 2 +- .../DoorInstanceActionShift.java | 6 +- .../actionshifthandlers/NpcActionShift.java | 2 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminCastle.java | 2 +- .../admincommandhandlers/AdminClanHall.java | 2 +- .../AdminDoorControl.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 2 +- .../AdminEventEngine.java | 4 +- .../admincommandhandlers/AdminFortSiege.java | 2 +- .../admincommandhandlers/AdminManor.java | 2 +- .../handlers/bypasshandlers/EventEngine.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../BuildCampSkillCondition.java | 4 +- .../CanSummonSiegeGolemSkillCondition.java | 4 +- .../OpCheckClassListSkillCondition.java | 2 +- .../OpCheckClassSkillCondition.java | 2 +- .../OpCheckFlagSkillCondition.java | 2 +- .../OpCheckResidenceSkillCondition.java | 2 +- .../PossessHolythingSkillCondition.java | 2 +- .../telnethandlers/player/SendMail.java | 2 +- .../usercommandhandlers/SiegeStatus.java | 2 +- .../voicedcommandhandlers/CastleVCmd.java | 2 +- .../DarkElfChange1/DarkElfChange1.java | 2 +- .../DarkElfChange2/DarkElfChange2.java | 2 +- .../DwarfBlacksmithChange1.java | 2 +- .../DwarfBlacksmithChange2.java | 2 +- .../DwarfWarehouseChange1.java | 2 +- .../DwarfWarehouseChange2.java | 2 +- .../ElfHumanClericChange2.java | 2 +- .../ElfHumanFighterChange1.java | 2 +- .../ElfHumanFighterChange2.java | 2 +- .../ElfHumanWizardChange1.java | 2 +- .../ElfHumanWizardChange2.java | 2 +- .../village_master/OrcChange1/OrcChange1.java | 2 +- .../village_master/OrcChange2/OrcChange2.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../org/l2jmobius/gameserver/FortUpdater.java | 2 +- .../org/l2jmobius/gameserver/GameServer.java | 2 +- .../org/l2jmobius/gameserver/Shutdown.java | 2 +- .../gameserver/data/sql/ClanTable.java | 8 +- .../gameserver/data/xml/ClanHallData.java | 2 +- .../gameserver/data/xml/ClassListData.java | 14 +- .../gameserver/data/xml/DailyMissionData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/PlayerTemplateData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 6 +- .../gameserver/enums/AcquireSkillType.java | 64 + .../{model/base => enums}/ClassId.java | 3 +- .../gameserver/enums/PlayerState.java | 30 + .../gameserver/enums/SocialClass.java | 39 + .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../ClanHallAuctionManager.java | 2 +- .../instancemanager/CommissionManager.java | 2 +- .../instancemanager/CustomMailManager.java | 2 +- .../instancemanager/DailyTaskManager.java | 4 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/FortManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 4 +- .../instancemanager/MailManager.java | 2 +- .../instancemanager/MapRegionManager.java | 6 +- .../instancemanager/MatchingRoomManager.java | 2 +- .../instancemanager/RankManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/SiegeManager.java | 4 +- .../instancemanager/events/GameEvent.java | 548 ++++++ .../instancemanager/games/BlockChecker.java | 762 ++++++++ .../model/ArenaParticipantsHolder.java | 8 +- .../l2jmobius/gameserver/model/Couple.java | 164 ++ .../model/DailyMissionDataHolder.java | 2 +- .../gameserver/model/{entity => }/Duel.java | 3 +- .../l2jmobius/gameserver/model/Message.java | 460 +++++ .../gameserver/model/SkillLearn.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../model/actor/instance/BlockInstance.java | 8 +- .../actor/instance/DefenderInstance.java | 4 +- .../model/actor/instance/DoorInstance.java | 4 +- .../actor/instance/FishermanInstance.java | 2 +- .../actor/instance/FortManagerInstance.java | 4 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 38 +- .../actor/instance/SiegeFlagInstance.java | 2 +- .../instance/VillageMasterDElfInstance.java | 2 +- .../instance/VillageMasterDwarfInstance.java | 2 +- .../VillageMasterFighterInstance.java | 2 +- .../actor/instance/VillageMasterInstance.java | 32 +- .../instance/VillageMasterMysticInstance.java | 2 +- .../instance/VillageMasterOrcInstance.java | 2 +- .../instance/VillageMasterPriestInstance.java | 2 +- .../model/actor/status/NpcStatus.java | 2 +- .../model/actor/status/PlayerStatus.java | 2 +- .../model/actor/status/SummonStatus.java | 2 +- .../model/actor/templates/PlayerTemplate.java | 2 +- .../model/base/AcquireSkillType.java | 64 - .../gameserver/model/base/PlayerState.java | 30 - .../gameserver/model/base/SocialClass.java | 39 - .../model/clanhallauction/Bidder.java | 70 - .../clanhallauction/ClanHallAuction.java | 194 -- .../ConditionPlayerCanCreateBase.java | 4 +- .../ConditionPlayerCanCreateOutpost.java | 4 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 4 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 4 +- .../model/entity/BlockCheckerEngine.java | 762 -------- .../gameserver/model/entity/ClanHall.java | 398 ---- .../gameserver/model/entity/Couple.java | 164 -- .../gameserver/model/entity/Fort.java | 1257 ------------ .../gameserver/model/entity/GameEvent.java | 548 ------ .../gameserver/model/entity/Message.java | 460 ----- .../gameserver/model/entity/Siegable.java | 67 - .../model/events/AbstractScript.java | 6 +- .../creature/player/OnPlayerSkillLearn.java | 2 +- .../impl/sieges/OnCastleSiegeFinish.java | 2 +- .../impl/sieges/OnCastleSiegeOwnerChange.java | 2 +- .../impl/sieges/OnCastleSiegeStart.java | 2 +- .../events/impl/sieges/OnFortSiegeFinish.java | 2 +- .../events/impl/sieges/OnFortSiegeStart.java | 2 +- .../ClassInfoHolder.java} | 8 +- .../SubClassHolder.java} | 7 +- .../gameserver/model/items/Henna.java | 2 +- .../model/items/instance/ItemInstance.java | 2 +- .../model/{entity => olympiad}/Hero.java | 4 +- .../gameserver/model/olympiad/Olympiad.java | 3 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/AbstractResidence.java | 2 +- .../gameserver/model/residences/Bidder.java | 70 + .../gameserver/model/residences/ClanHall.java | 397 ++++ .../model/residences/ClanHallAuction.java | 193 ++ .../model/{entity => siege}/Castle.java | 2 +- .../gameserver/model/siege/Fort.java | 1257 ++++++++++++ .../model/{entity => siege}/FortSiege.java | 2 +- .../gameserver/model/siege/Siegable.java | 67 + .../model/{entity => siege}/Siege.java | 3 +- .../stats/finalizers/RegenHPFinalizer.java | 10 +- .../stats/finalizers/RegenMPFinalizer.java | 8 +- .../model/zone/type/ClanHallZone.java | 2 +- .../model/zone/type/DamageZone.java | 2 +- .../gameserver/model/zone/type/SiegeZone.java | 6 +- .../gameserver/model/zone/type/SwampZone.java | 2 +- .../gameserver/model/zone/type/TaxZone.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/NewCharacter.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 6 +- .../RequestAcquireSkillInfo.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestConfirmSiegeWaitingList.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestFortressMapInfo.java | 2 +- .../RequestFortressSiegeInfo.java | 2 +- .../clientpackets/RequestJoinSiege.java | 2 +- .../RequestListPartyMatchingWaitingRoom.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestRestartPoint.java | 10 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../RequestSetCastleSiegeTime.java | 2 +- .../RequestSiegeAttackerList.java | 2 +- .../RequestSiegeDefenderList.java | 2 +- .../clientpackets/RequestWriteHeroWords.java | 2 +- .../classchange/ExRequestClassChange.java | 2 +- .../primeshop/RequestBRPresentBuyProduct.java | 2 +- .../teleports/ExRequestTeleport.java | 2 +- .../serverpackets/AcquireSkillInfo.java | 2 +- .../serverpackets/CharSelectionInfo.java | 2 +- .../gameserver/network/serverpackets/Die.java | 4 +- .../ExAcquirableSkillListByClass.java | 2 +- .../network/serverpackets/ExCastleState.java | 2 +- .../network/serverpackets/ExHeroList.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../serverpackets/ExSendManorList.java | 2 +- .../network/serverpackets/ExShowAgitInfo.java | 2 +- .../serverpackets/ExShowCastleInfo.java | 2 +- .../serverpackets/ExShowFortressInfo.java | 2 +- .../serverpackets/ExShowFortressMapInfo.java | 2 +- .../ExShowFortressSiegeInfo.java | 2 +- .../ExShowProcureCropDetail.java | 2 +- .../serverpackets/ExShowReceivedPostList.java | 2 +- .../serverpackets/ExShowSentPostList.java | 2 +- .../network/serverpackets/ExSubjobInfo.java | 6 +- .../serverpackets/SiegeAttackerList.java | 2 +- .../serverpackets/SiegeDefenderList.java | 2 +- .../network/serverpackets/SiegeInfo.java | 2 +- .../network/serverpackets/UserInfo.java | 2 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 2 +- .../ranking/ExOlympiadMyRankingInfo.java | 2 +- .../MessageDeletionTaskManager.java | 2 +- .../taskmanager/tasks/TaskBirthday.java | 2 +- .../gameserver/util/DocumentBase.java | 2 +- 5480 files changed, 109788 insertions(+), 109821 deletions(-) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/{model/base => enums}/AcquireSkillType.java (92%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums}/ClassId.java (96%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums}/PlayerState.java (91%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums}/SocialClass.java (91%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/{model/entity/BlockCheckerEngine.java => instancemanager/games/BlockChecker.java} (95%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model}/Couple.java (95%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model}/Duel.java (95%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model}/Message.java (95%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassInfo.java => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java (88%) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad}/Hero.java (96%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences}/Bidder.java (92%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences}/ClanHall.java (95%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences}/ClanHallAuction.java (94%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege}/Castle.java (95%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege}/Fort.java (96%) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege}/Siegable.java (93%) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums}/AcquireSkillType.java (92%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums}/ClassId.java (96%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums}/PlayerState.java (91%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums}/SocialClass.java (91%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java (95%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model}/Couple.java (95%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model}/Duel.java (95%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model}/Message.java (95%) rename L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassInfo.java => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java (88%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad}/Hero.java (96%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/{entity => residences}/ClanHall.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege}/Castle.java (95%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege}/Fort.java (96%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege}/Siegable.java (93%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums}/AcquireSkillType.java (92%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums}/ClassId.java (96%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums}/PlayerState.java (91%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums}/SocialClass.java (91%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java (95%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model}/Couple.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model}/Duel.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model}/Message.java (95%) rename L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassInfo.java => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java (88%) rename L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad}/Hero.java (96%) rename L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/{clanhallauction => residences}/Bidder.java (92%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences}/ClanHall.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences}/ClanHallAuction.java (94%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege}/Castle.java (95%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege}/Fort.java (96%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege}/FortSiege.java (96%) rename {L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege}/Siegable.java (93%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/{model/base => enums}/AcquireSkillType.java (92%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums}/ClassId.java (96%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums}/PlayerState.java (91%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/{model/base => enums}/SocialClass.java (91%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model}/Couple.java (95%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model}/Duel.java (95%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{entity => }/Message.java (95%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{base/ClassInfo.java => holders/ClassInfoHolder.java} (88%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename {L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad}/Hero.java (96%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences}/Bidder.java (92%) create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences}/ClanHallAuction.java (94%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege}/Fort.java (96%) rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege}/FortSiege.java (96%) rename {L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege}/Siegable.java (93%) rename L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Couple.java rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{entity => }/Duel.java (95%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{clanhallauction => residences}/Bidder.java (92%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHall.java rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{clanhallauction => residences}/ClanHallAuction.java (94%) rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename {L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename {L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java rename {L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad}/ClanHall.java (96%) rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Castle.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java rename L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java rename L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity => data}/Announcements.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/base => enums}/ClassLevel.java (91%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/enums}/ClassType.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/base => enums}/PlayerClass.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/CTF.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/DM.java (95%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events}/EventInterface.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event/manager => instancemanager/events}/EventManager.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/EventPoint.java (93%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/manager => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events}/EventTask.java (90%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event/manager => instancemanager/events}/EventsGlobalTask.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/GameEvent.java (95%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events}/PcPoint.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/TvT.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/VIP.java (96%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games}/Lottery.java (95%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games}/MonsterRace.java (96%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model}/DimensionalRift.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{base => }/SoulCrystal.java (93%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{base => }/SubClass.java (93%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/Wedding.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/Olympiad.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadGame.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadManager.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadPeriod.java (90%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadStadium.java (93%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences}/ClanHall.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity/Auction.java => residences/ClanHallAuction.java} (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/sevensigns/SevenSigns.java (96%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model}/sevensigns/SevenSignsFestival.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/Castle.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/CastleUpdater.java (94%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model}/siege/ClanHallSiege.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/Fort.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/FortSiege.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/Siege.java (96%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model}/siege/clanhalls/BanditStrongholdSiege.java (95%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model}/siege/clanhalls/DevastatedCastle.java (96%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/clanhalls/FortressOfResistance.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{entity => }/siege/clanhalls/WildBeastFarmSiege.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity => data}/Announcements.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/base => enums}/ClassLevel.java (91%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/base => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/enums}/ClassType.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/base => enums}/PlayerClass.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/CTF.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/DM.java (95%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events}/EventInterface.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event/manager => instancemanager/events}/EventManager.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/EventPoint.java (93%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/manager => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events}/EventTask.java (90%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event/manager => instancemanager/events}/EventsGlobalTask.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/GameEvent.java (95%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events}/PcPoint.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/TvT.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{model/entity/event => instancemanager/events}/VIP.java (96%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games}/Lottery.java (95%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games}/MonsterRace.java (96%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model}/DimensionalRift.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/Duel.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{base => }/SoulCrystal.java (93%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{base => }/SubClass.java (93%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/Wedding.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/Olympiad.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadGame.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadManager.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadPeriod.java (90%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/olympiad/OlympiadStadium.java (93%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences}/ClanHall.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity/Auction.java => residences/ClanHallAuction.java} (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/sevensigns/SevenSigns.java (96%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model}/sevensigns/SevenSignsFestival.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/Castle.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/CastleUpdater.java (94%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model}/siege/ClanHallSiege.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/Fort.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/FortSiege.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/Siege.java (96%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model}/siege/clanhalls/BanditStrongholdSiege.java (95%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model}/siege/clanhalls/DevastatedCastle.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/clanhalls/FortressOfResistance.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{entity => }/siege/clanhalls/WildBeastFarmSiege.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/base => enums}/AcquireSkillType.java (92%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/SocialClass.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEvent.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventListener.java (92%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventPlayer.java (91%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventTeam.java (94%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/events}/TvTEventTeleporter.java (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTManager.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{model/entity/BlockCheckerEngine.java => instancemanager/games/BlockChecker.java} (95%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Couple.java rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model}/DimensionalRift.java (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => }/Duel.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => }/Message.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => }/RecoBonus.java (91%) delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{base/ClassInfo.java => holders/ClassInfoHolder.java} (88%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (87%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => residences}/AbstractResidence.java (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity/clanhall => residences}/AuctionableHall.java (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => residences}/ClanHall.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity/Auction.java => residences/ClanHallAuction.java} (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{ => model/sevensigns}/SevenSigns.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/{ => model/sevensigns}/SevenSignsFestival.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => siege}/Fort.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/ClanHallSiegeEngine.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/SiegableHall.java (93%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/SiegeStatus.java (90%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/base => enums}/AcquireSkillType.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/SocialClass.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/GameEvent.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEvent.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventListener.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventPlayer.java (91%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTEventTeam.java (94%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events}/TvTEventTeleporter.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity => instancemanager/events}/TvTManager.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{model/entity/BlockCheckerEngine.java => instancemanager/games/BlockChecker.java} (95%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Couple.java rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model}/DimensionalRift.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => }/Duel.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => }/Message.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/NevitSystem.java => Nevit.java} (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => }/RecoBonus.java (91%) delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{base/ClassInfo.java => holders/ClassInfoHolder.java} (88%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (87%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => residences}/AbstractResidence.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/clanhall => residences}/AuctionableHall.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => residences}/ClanHall.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/Auction.java => residences/ClanHallAuction.java} (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{ => model/sevensigns}/SevenSigns.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/{ => model/sevensigns}/SevenSignsFestival.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => siege}/Fort.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/ClanHallSiegeEngine.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/SiegableHall.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{entity/clanhall => siege/clanhalls}/SiegeStatus.java (90%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename {L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity => L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege}/Siege.java (96%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Siegable.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Castle.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siegable.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Siege.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siegable.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java rename L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Castle.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siegable.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Siege.java rename L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/{base/ClassInfo.java => holders/ClassInfoHolder.java} (89%) create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java rename L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siegable.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ClassId.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Couple.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Duel.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/ClassId.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/ClassInfo.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Castle.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Duel.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/FortSiege.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Siegable.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Siege.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/FortSiege.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siegable.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/{model/base => enums}/ClassId.java (95%) create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/PlayerState.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/SocialClass.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Couple.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{entity => }/Duel.java (95%) create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/base/PlayerState.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/base/SocialClass.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/ClanHall.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/Couple.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/Fort.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/GameEvent.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/Message.java delete mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{base/ClassInfo.java => holders/ClassInfoHolder.java} (89%) rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{base/SubClass.java => holders/SubClassHolder.java} (91%) rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{entity => olympiad}/Hero.java (96%) create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/Bidder.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHall.java create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{entity => siege}/Castle.java (95%) create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{entity => siege}/FortSiege.java (96%) create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siegable.java rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{entity => siege}/Siege.java (96%) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index f1d9eb0f66..2f1b8d574d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -20,10 +20,10 @@ import java.util.List; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4f1884483e..3066ed9084 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -24,13 +24,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChangeToAwakenedClass; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index c0e54a4fe0..8e2ecfdbda 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -23,12 +23,12 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index ebf3864210..371e8b6efc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -19,12 +19,12 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 204b9a5667..e3bd131843 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -31,18 +31,18 @@ import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -243,7 +243,7 @@ public class Raina extends AbstractNpcAI { final StringBuilder sb = new StringBuilder(); final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "subclassRemoveList.html"); - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass != null) { @@ -673,7 +673,7 @@ public class Raina extends AbstractNpcAI // scan for already used subclasses final int availClassId = pclass.getId(); final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { final ClassId subId = ClassId.getClassId(subList.getClassId()); if (subId.equalsOrChildOf(cid)) @@ -703,7 +703,7 @@ public class Raina extends AbstractNpcAI { final ClassId cid = ClassId.getClassId(classId); ClassId subClassId; - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { subClassId = ClassId.getClassId(subList.getClassId()); if (subClassId.equalsOrChildOf(cid)) @@ -739,7 +739,7 @@ public class Raina extends AbstractNpcAI private boolean hasAllSubclassLeveled(PlayerInstance player) { boolean leveled = true; - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { if ((sub != null) && (sub.getLevel() < 75)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 2c512b361f..123a96820d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; @@ -210,7 +210,7 @@ public class Trandon extends AbstractNpcAI takeItems(player, SUB_CERTIFICATE, -1); player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, npc); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { player.getVariables().remove(SUB_CERTIFICATE_COUNT_VAR + subclass.getClassId()); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java index 0f01060430..8d0d2376bf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java @@ -19,11 +19,11 @@ package ai.others.AlchemistManager; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 8edb057dd4..79f61014f1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -19,8 +19,8 @@ package ai.others.CastleAmbassador; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 2d648de940..ddc6ff9e74 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -37,9 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; @@ -48,6 +45,9 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 6501fcc558..ad39458983 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java index 7ffba9221f..18abb8dafe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleSideEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleSideEffect.java index 4a5e4b04b0..b1fd925efc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleSideEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleSideEffect.java @@ -18,7 +18,7 @@ package ai.others; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ExCastleState; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 6695d44df2..00fd04bfd7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 9d976cd1dc..1c6b4d8097 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.Bidder; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 595f8c88a0..b73a819176 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 22fbc5fbe1..822dcc2e68 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index d60ee2e170..8c8b39a9df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 7b497c1b38..a9ba427796 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java index 1b8c0cc50e..1ca2951ce7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java @@ -21,11 +21,11 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 86669cf7d3..33502c6fb1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.Mentee; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 71682398fc..081a1fbd86 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index bbb3a24ad4..19b18e1eed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -30,13 +30,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.handler.BypassHandler; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index dded92c215..f469c39159 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java index 174255624f..576eadf4f2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 22c7dd487b..3eeeafb2cd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 95d0581c29..e01a966fd4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -19,10 +19,10 @@ package custom.FakePlayers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.FakePlayerData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 597d7031c1..d4c850f564 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java index 33e960d44c..c61c07b685 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; public class ItemInstanceAction implements IActionHandler diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java index 1f204280f0..4b75e2bfb8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IActionHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index e51c05342a..b4d3c2a645 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StaticObject; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d61b3cd144..27c1e2cd73 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 04df6fcb37..45884c05ce 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java index 1dedada1f4..94348e020e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 1c1a282776..de7b086fb5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 83a120d8c4..e04d66f3e2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 71e1e8395b..3118efdf25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -46,7 +47,6 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 462a5f4557..2d7e669ac4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.GameEvent.EventState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 77ae194287..3ccca7b46d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java index 298eecbede..014c8e7631 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 63cdf1ab2d..081bbe2c2b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -19,9 +19,9 @@ package handlers.bypasshandlers; import java.util.logging.Level; import org.l2jmobius.gameserver.handler.IBypassHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; public class EventEngine implements IBypassHandler { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 569c3b0883..7f3b1c4f76 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.handler.IWriteBoardHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index b174f935ff..467d6c462d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,12 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dafe04d202..894e1f3ed9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 0d1c34c7f1..eb768e547a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 3d3ca58f22..136183a12e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 5d27431c66..beb6e18018 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index e1b3e072c7..bc0212c92a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index f561ab18d5..0c58ee8a7d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index d7492d9b97..32107cf16c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ffcb045f63..0d3c9573e8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 29c2260378..99c4ca7cc7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index 512f140411..1517ea54c5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 66067f20a9..d2d4c45448 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -18,11 +18,11 @@ package handlers.skillconditionhandlers; import java.util.List; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 2c4160ec61..2531d33eae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -16,11 +16,11 @@ */ package handlers.skillconditionhandlers; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 4d99f48f53..6ece0fc678 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index ca2af837ab..35b27840c0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 1ceaa4af0a..07ca155a52 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java index 7a0d9959c5..b906d68f89 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java index 9776edd1c5..da9b15864c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.type.SiegeZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 21e5f69860..12378128cf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 3b67b71e46..4dedee6473 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; import instances.AbstractInstance; import quests.Q00512_BladeUnderFoot.Q00512_BladeUnderFoot; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 8054e0ed0d..b0ed1fc984 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -21,6 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 6af5a366aa..686b01379b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; import instances.AbstractInstance; import quests.Q00511_AwlUnderFoot.Q00511_AwlUnderFoot; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 177e234739..408e426ce5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 3640d0b5e4..b3de2f227a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 7fb6ab32db..8053c44084 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -16,9 +16,9 @@ */ package quests.Q00061_LawEnforcement; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 486056ca28..135a98ec78 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Awl Under Foot (511) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java index b666a96d4a..4c5c32a2cf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Blade Under Foot (512) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 66799f1982..5513e9ef4e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Light within the Darkness (726) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 6c44c24891..f3048633ee 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Hope within the Darkness (727) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java index 3e5f6c500d..0c10e7f9ae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java @@ -16,11 +16,11 @@ */ package quests.Q00784_TheQuietKiller; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java index 6df29a5668..eb04bc787f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java @@ -16,11 +16,11 @@ */ package quests.Q00785_ASuspiciousIngredient; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index b9c68b1388..b52c921c8a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -19,11 +19,11 @@ package quests.Q10331_StartOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java index 5ba5e84c04..cd068906c1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java @@ -17,12 +17,12 @@ package quests.Q10338_SeizeYourDestiny; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 50910ba20f..7c7505c5d7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -19,12 +19,12 @@ package quests.Q10360_CertificationOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index db1ae63ac7..bf8dc2bd25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10735_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 9c9a3b4737..c01aec6b3d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10736_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 43525550b4..4e672254dc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 14596da80f..905999c4a2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -18,13 +18,13 @@ package quests.Q10752_WindsOfFateAPromise; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 06f4cda8d2..076e8eac0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 9444f7ed35..7f581a9ff1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -19,10 +19,10 @@ package quests.Q10790_AMercenaryHelper; import java.util.HashMap; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 6610038b7b..ea410f1105 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -16,12 +16,12 @@ */ package quests.Q10791_TheManOfMystery; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 86ffa34493..5bd5b1bc99 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index f56a4948eb..db4b63adb8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index 21d143da8b..9d958a3a21 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java index 2a4be6bec3..0d8cba2363 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java @@ -59,9 +59,9 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/FortUpdater.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/FortUpdater.java index b984f26621..a502f222a1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/FortUpdater.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/FortUpdater.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Class managing periodical events with castle diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 922b3d77de..20ae528fa8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -141,8 +141,8 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java index c5aae8dd33..e58b8b6e20 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 53b0e7cfd2..b3cb0d7e2d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -44,14 +44,14 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanWar; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index 5f36b093b2..283e2f0116 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClassListData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClassListData.java index e0835c9ce8..dca159e58e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClassListData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ClassListData.java @@ -26,8 +26,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.ClassInfo; +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.holders.ClassInfoHolder; /** * Loads the the list of classes and it's info. @@ -37,7 +37,7 @@ public class ClassListData implements IXmlReader { private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName()); - private final Map _classData = new ConcurrentHashMap<>(); + private final Map _classData = new ConcurrentHashMap<>(); /** * Instantiates a new class list data. @@ -78,7 +78,7 @@ public class ClassListData implements IXmlReader className = attr.getNodeValue(); attr = attrs.getNamedItem("parentClassId"); parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null; - _classData.put(classId, new ClassInfo(classId, className, parentClassId)); + _classData.put(classId, new ClassInfoHolder(classId, className, parentClassId)); } } } @@ -89,7 +89,7 @@ public class ClassListData implements IXmlReader * Gets the class list. * @return the complete class list. */ - public Map getClassList() + public Map getClassList() { return _classData; } @@ -99,7 +99,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(ClassId classId) + public ClassInfoHolder getClass(ClassId classId) { return _classData.get(classId); } @@ -109,7 +109,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id as integer. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(int classId) + public ClassInfoHolder getClass(int classId) { final ClassId id = ClassId.getClassId(classId); return (id != null) ? _classData.get(id) : null; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java index ab5be1c99c..86d06999b3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 76d501328b..629cf7dc77 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 342d477cb7..1915d5a056 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -29,13 +29,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MacroType; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java index 19981c3d24..63010ebdfd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; /** * Loads player's base stats. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index cdae80bb3d..9d1cc99f37 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -38,15 +38,15 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java similarity index 92% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java index f98e8c4955..46f8021885 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Learning skill types. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/ClassId.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassId.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/ClassId.java index fdc2fffa68..b6f96a8c9c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/ClassId.java @@ -14,14 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/PlayerState.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/PlayerState.java similarity index 91% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/PlayerState.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/PlayerState.java index cb16dd5971..fc67134f9f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/PlayerState.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/PlayerState.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; public enum PlayerState { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SocialClass.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/SocialClass.java similarity index 91% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SocialClass.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/SocialClass.java index 3b86db6e1e..b479370447 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SocialClass.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/SocialClass.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Enumerated for Social Classes. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 6bc30f2206..2618c1b7b1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager implements InstanceListManager { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e9aac43188..3d8c1f50e4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.interfaces.IStorable; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java index 1daea8553c..781c07913c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -38,11 +38,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.CommissionManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.commission.CommissionItem; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java index 054c6f4bcc..dd530dd6d3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java @@ -30,9 +30,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4eb22e6244..fa42b8b8f1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; @@ -109,7 +109,7 @@ public class DailyTaskManager extends AbstractEventManager> for (PlayerInstance player : World.getInstance().getPlayers()) { player.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS, false); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { subclass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index a551a07de0..233bea17ac 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 30b289b8b6..767c90e4ba 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.InstanceListManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; public class FortManager implements InstanceListManager { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index b5718c1ebd..cbc70a9567 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,9 +38,9 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MailManager.java index 2a82541b39..8fa771c248 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MailManager.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import org.l2jmobius.gameserver.network.serverpackets.ExUnReadMailCount; import org.l2jmobius.gameserver.taskmanager.MessageDeletionTaskManager; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 0b7b56439c..920d974e48 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java index aa5fe75760..b3d0504beb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java @@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MatchingRoomType; import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.matching.MatchingRoom; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index a926d9b04b..78cf922b7f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Siege Guard Manager. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index b17a9b0197..2c87f35757 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.TowerSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; public class SiegeManager diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/GameEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/GameEvent.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java index b8c0608bd1..c0cc276691 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/GameEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.events; import java.io.BufferedReader; import java.io.FileReader; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 60e691a19c..687d1288b9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.games; import java.util.Map; import java.util.Map.Entry; @@ -54,9 +54,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author BiggBoss */ -public class BlockCheckerEngine +public class BlockChecker { - protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockChecker.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -127,7 +127,7 @@ public class BlockCheckerEngine // Preserve from exploit reward by logging out protected boolean _abnormalEnd = false; - public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) + public BlockChecker(ArenaParticipantsHolder holder, int arena) { _holder = holder; if ((arena > -1) && (arena < 4)) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index e9b0a4dbfc..5da780a150 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,14 +34,14 @@ public class ArenaParticipantsHolder private final int _arena; private final List _redPlayers; private final List _bluePlayers; - private final BlockCheckerEngine _engine; + private final BlockChecker _engine; public ArenaParticipantsHolder(int arena) { _arena = arena; _redPlayers = new ArrayList<>(6); _bluePlayers = new ArrayList<>(6); - _engine = new BlockCheckerEngine(this, _arena); + _engine = new BlockChecker(this, _arena); } public List getRedPlayers() @@ -130,7 +130,7 @@ public class ArenaParticipantsHolder _bluePlayers.clear(); } - public BlockCheckerEngine getEvent() + public BlockChecker getEvent() { return _engine; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Couple.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Couple.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Couple.java index 54104ff7ab..dbca7d1e97 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Couple.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Duel.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java index 1d117e44d8..65eddcbb0c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Duel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.util.Calendar; import java.util.List; @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.enums.Team; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Message.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Message.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java index 97d24eb1c8..e6b1c31d32 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Message.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java index 2a32e32d54..5eb90fb4ef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.base.SocialClass; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6bd7546d3e..68e8fbefa8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -57,7 +57,6 @@ import org.l2jmobius.gameserver.model.actor.status.AttackableStatus; import org.l2jmobius.gameserver.model.actor.tasks.attackable.CommandChannelTimer; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAggroRangeEnter; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttack; @@ -67,6 +66,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index 5b8fd38562..510c9b6cbc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -61,9 +61,6 @@ import org.l2jmobius.gameserver.model.actor.instance.WarehouseInstance; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcCanBeSeen; @@ -80,6 +77,9 @@ import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java index 4698bfdcf8..7eacda4aa1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; @@ -51,7 +51,7 @@ public class BlockInstance extends MonsterInstance // Do not update color while sending old info synchronized (this) { - final BlockCheckerEngine event = holder.getEvent(); + final BlockChecker event = holder.getEvent(); if (_colorEffect == 0x53) { // Change color @@ -137,7 +137,7 @@ public class BlockInstance extends MonsterInstance } } - private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockCheckerEngine eng) + private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockChecker eng) { eng.increasePlayerPoints(player, team); @@ -149,7 +149,7 @@ public class BlockInstance extends MonsterInstance eng.getHolder().broadCastPacketToTeam(secretPoints); } - private void dropItem(int id, BlockCheckerEngine eng, PlayerInstance player) + private void dropItem(int id, BlockChecker eng, PlayerInstance player) { final ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); final int x = getX() + Rnd.get(50); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java index b882c183a6..0b025e1f03 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index 975d847005..d5d0a599f6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 21141aa0a5..3602d314ee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index a9e7ce65a2..8c3be792ee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 588e4d6da9..3d16b348a2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.FolkStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a18ab46e78..8b09529e75 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -83,6 +83,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ClanWarState; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; @@ -122,11 +123,13 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.SellBuffsManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.ContactList; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; @@ -176,8 +179,6 @@ import org.l2jmobius.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask; import org.l2jmobius.gameserver.model.actor.tasks.player.WaterTask; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -186,12 +187,6 @@ import org.l2jmobius.gameserver.model.clan.ClanWar; import org.l2jmobius.gameserver.model.cubic.CubicInstance; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Duel; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Hero; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; @@ -222,6 +217,7 @@ import org.l2jmobius.gameserver.model.holders.PlayerEventHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; @@ -243,6 +239,7 @@ import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -252,6 +249,9 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -443,7 +443,7 @@ public class PlayerInstance extends Playable private boolean _petItems = false; /** The list of sub-classes this character has. */ - private final Map _subClasses = new ConcurrentHashMap<>(); + private final Map _subClasses = new ConcurrentHashMap<>(); private static final String ORIGINAL_CLASS_VAR = "OriginalClass"; @@ -6606,7 +6606,7 @@ public class PlayerInstance extends Playable // Restore Subclass Data (cannot be done earlier in function) if (restoreSubClassData(player) && (activeClassId != player.getBaseClass())) { - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass.getClassId() == activeClassId) { @@ -6826,7 +6826,7 @@ public class PlayerInstance extends Playable { while (rset.next()) { - final SubClass subClass = new SubClass(); + final SubClassHolder subClass = new SubClassHolder(); subClass.setClassId(rset.getInt("class_id")); subClass.setDualClassActive(rset.getBoolean("dual_class")); subClass.setVitalityPoints(rset.getInt("vitality_points")); @@ -7140,7 +7140,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(UPDATE_CHAR_SUBCLASS)) { - for (SubClass subClass : getSubClasses().values()) + for (SubClassHolder subClass : getSubClasses().values()) { statement.setLong(1, subClass.getExp()); statement.setLong(2, subClass.getSp()); @@ -9531,7 +9531,7 @@ public class PlayerInstance extends Playable // Note: Never change _classIndex in any method other than setActiveClass(). - final SubClass newClass = new SubClass(); + final SubClassHolder newClass = new SubClassHolder(); newClass.setClassId(classId); newClass.setClassIndex(classIndex); newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); @@ -9622,7 +9622,7 @@ public class PlayerInstance extends Playable EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); } - final SubClass subClass = getSubClasses().get(classIndex); + final SubClassHolder subClass = getSubClasses().get(classIndex); if (subClass == null) { return false; @@ -9721,7 +9721,7 @@ public class PlayerInstance extends Playable { return false; } - final SubClass subClass = _subClasses.get(_classIndex); + final SubClassHolder subClass = _subClasses.get(_classIndex); if (subClass == null) { return false; @@ -9731,7 +9731,7 @@ public class PlayerInstance extends Playable public boolean hasDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9741,9 +9741,9 @@ public class PlayerInstance extends Playable return false; } - public SubClass getDualClass() + public SubClassHolder getDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9753,7 +9753,7 @@ public class PlayerInstance extends Playable return null; } - public Map getSubClasses() + public Map getSubClasses() { return _subClasses; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 217fb1c4b0..0607b51090 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.SiegeFlagStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index edad148a46..7d586645f8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -24,6 +24,7 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -32,12 +33,11 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java index 59f438128f..fd5f1052e6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; public class NpcStatus extends CreatureStatus { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index 0976283d6d..e3b931cdd3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.DuelManager; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 6c305ffe1b..341ed13771 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 782dca3687..f2acbb5d8a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -22,9 +22,9 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index f27bfd1912..df4177e12b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 3466416f97..8fc4eaaad2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index cba6999dc2..17a8de9fd3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 6b4fb92953..cee0537b63 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 7f5b51a8f9..07282525cd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 81a9539d78..c5cad7593a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index c020f982f3..6a9ce6b0e4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.conditions; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2e67022ea7..3233eacd28 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index c1f1a70c2d..7d8f8d63f7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; @@ -64,9 +65,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.Ids; import org.l2jmobius.gameserver.model.events.annotations.NpcLevelRange; @@ -145,6 +143,8 @@ import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java index 655a3fb505..0c73b7dfa2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.creature.player; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java index 0ca3450101..880ee008a0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java index 9f1e438d15..7f93a263ef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java index 0e13607419..47c5ea3720 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java index 9e81e6f036..1e9ef8a3e1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java index c0d9c21d7d..a9d480bbc0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java similarity index 88% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassInfo.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java index f4cfcb60c5..cb1c49612e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java @@ -14,15 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import java.util.regex.Matcher; +import org.l2jmobius.gameserver.enums.ClassId; + /** * This class will hold the information of the player classes. * @author Zoey76 */ -public class ClassInfo +public class ClassInfoHolder { private final ClassId _classId; private final String _className; @@ -34,7 +36,7 @@ public class ClassInfo * @param className the in game class name. * @param parentClassId the parent class for the given {@code classId}. */ - public ClassInfo(ClassId classId, String className, ClassId parentClassId) + public ClassInfoHolder(ClassId classId, String className, ClassId parentClassId) { _classId = classId; _className = className; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java similarity index 91% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java index 7c18ab192e..91b3f75228 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java @@ -14,17 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; /** * Character Sub-Class Definition
* Used to store key information about a character's sub-class. * @author Tempy */ -public class SubClass +public class SubClassHolder { private static final byte MAX_LEVEL = Config.MAX_SUBCLASS_LEVEL < ExperienceData.getInstance().getMaxLevel() ? Config.MAX_SUBCLASS_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1); @@ -39,7 +40,7 @@ public class SubClass private int _vitalityPoints = 0; private boolean _dualClass = false; - public SubClass() + public SubClassHolder() { // Used for specifying ALL attributes of a sub class directly, // using the preset default values. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java index 56dd78243c..426a12682a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,8 +21,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 5ea60216e5..1bd807ff40 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -60,7 +60,6 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; @@ -78,6 +77,7 @@ import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5d13146ab0..bed9045612 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.olympiad; import java.sql.Connection; import java.sql.PreparedStatement; @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 65302ee1c3..d824e494ed 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -47,7 +47,6 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java index 710866e8de..2fa2d6e84b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -40,7 +40,9 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.TrapAction; @@ -54,8 +56,6 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index 50b91578e3..cf665da8f8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -30,9 +30,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.zone.type.ResidenceZone; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/Bidder.java similarity index 92% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/Bidder.java index 24b8576a12..f4d30762c2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/Bidder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.time.Instant; import java.time.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2da8cf9508..a292c439e5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java similarity index 94% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 746832fd57..2fa683814d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java index 3bf01c04ea..8aa51ae1d1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Fort.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java index 4b535778a2..e55f1b4a2f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/FortSiege.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/FortSiege.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e1c798b801..4788e0f6fe 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siegable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siegable.java similarity index 93% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siegable.java index a450298acc..6976ee8a47 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siegable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siegable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.util.Calendar; import java.util.Collection; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java rename to L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java index 339a49bef9..d5e4b76039 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; @@ -60,6 +60,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 3637bfe805..c7b80987c7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -28,14 +28,14 @@ import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java index d09ad19b54..c3ac06e1fc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 73d3e8ddf5..354d6d853d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index 1d9657b72b..13b533a54f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.TaskZoneSettings; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java index 9f749f9a6e..5a3805fae0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index f70c352a0e..c984d97cd6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java index d898d2c397..6dcd5de9a1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 521e4ad7bb..57e75ae3e9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.InitialShortcutData; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; @@ -35,7 +36,6 @@ import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a47acd0251..6b1b12e27a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -43,20 +43,20 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PetitionManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 654c95780e..9bb35cb7fa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; -import org.l2jmobius.gameserver.model.base.ClassId; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 8340f2d27f..fb2c09c0b4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -22,6 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.enums.Race; @@ -32,14 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; @@ -568,7 +568,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getDualClassLevel() > 0) { - final SubClass playerDualClass = player.getDualClass(); + final SubClassHolder playerDualClass = player.getDualClass(); if ((playerDualClass == null) || (playerDualClass.getLevel() < skillLearn.getDualClassLevel())) { return false; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 828b38864b..0d5672fb40 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 5001cf8b8e..5d0fbf40ba 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8fc855eca0..1e87455cc7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index abb645f985..ef8b2cf963 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 81dbb0d704..52863e1fd5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 8838fefa65..981996d4c2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 2834a27ebd..272e2f7fe6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 8f0bfcd431..05e09e6dfc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java index bf37f72ae5..b2f32527da 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 19d94c2585..715be58f93 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java index 4c0af8accc..84d38a443a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; import org.l2jmobius.commons.network.PacketReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 122d60272e..7f0e32b31e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 2aaa26b599..7d42393a58 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index ce9f7f44ec..f8ce2b0922 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 9b655cdc92..940cbd3169 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 283983cc6b..30e0b1b097 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -27,16 +27,16 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.Event; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 398ca12513..458046879d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index ec7007f7b9..4f70ca3668 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 107afbb395..0e7b4529e5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java index 34370c05ee..097e8f5d30 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java index ba4f579ddc..6df5163c58 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java index d8b35ee5a3..56f921bcab 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index c2fc4effe6..f6702caa41 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java index 6ee22ecbb0..8f97156f15 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index aeb9f355cd..0852a21da4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 203854a8c0..3d741a86a6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index 70635ff95b..a4f7617e60 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 6b8c0d64e9..2b43c0ce4b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.CastleSide; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index bfdaecf6b9..71754ea3ca 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index dd6984a815..a40690e845 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 3200220765..993f77ec6b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 0e2325e231..7f8a08691c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index f7f1953506..1e06cc2a3f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 7bacef1cfc..82554fdc5f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 778bd1e898..7a9f6f7389 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 176e9b44d1..ee9fa9fd37 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index b17a294893..f389b26ed5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 33d1abccb9..27da99cf41 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index fe4407474e..3e3765eed2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index db4e099d22..3656ddbc4e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index 6f728b4fe4..2ae09181a7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index a9d9c157f7..04e0f46871 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -43,7 +43,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket _type = type.ordinal(); _subs = new ArrayList<>(); _subs.add(0, new SubInfo(player)); - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { _subs.add(new SubInfo(sub)); } @@ -56,7 +56,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket private final int _level; private final int _type; - public SubInfo(SubClass sub) + public SubInfo(SubClassHolder sub) { _index = sub.getClassIndex(); _classId = sub.getClassId(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 855d3d5fb0..66eccc7fbf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index cc12b05bc8..5d5c831f14 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 01dcc0ed18..5ed678042b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 1c75cd283f..88252d7c6e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,11 +20,11 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index 05638be656..eb0dd7a59f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java index f93fdd9c13..d95f42827a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.taskmanager.Task; import org.l2jmobius.gameserver.taskmanager.TaskManager; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java index f9e85c9134..ab7570016e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index f1d9eb0f66..2f1b8d574d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -20,10 +20,10 @@ import java.util.List; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4f1884483e..3066ed9084 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -24,13 +24,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChangeToAwakenedClass; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index c0e54a4fe0..8e2ecfdbda 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -23,12 +23,12 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index ebf3864210..371e8b6efc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -19,12 +19,12 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 204b9a5667..e3bd131843 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -31,18 +31,18 @@ import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -243,7 +243,7 @@ public class Raina extends AbstractNpcAI { final StringBuilder sb = new StringBuilder(); final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "subclassRemoveList.html"); - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass != null) { @@ -673,7 +673,7 @@ public class Raina extends AbstractNpcAI // scan for already used subclasses final int availClassId = pclass.getId(); final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { final ClassId subId = ClassId.getClassId(subList.getClassId()); if (subId.equalsOrChildOf(cid)) @@ -703,7 +703,7 @@ public class Raina extends AbstractNpcAI { final ClassId cid = ClassId.getClassId(classId); ClassId subClassId; - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { subClassId = ClassId.getClassId(subList.getClassId()); if (subClassId.equalsOrChildOf(cid)) @@ -739,7 +739,7 @@ public class Raina extends AbstractNpcAI private boolean hasAllSubclassLeveled(PlayerInstance player) { boolean leveled = true; - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { if ((sub != null) && (sub.getLevel() < 75)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 2c512b361f..123a96820d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; @@ -210,7 +210,7 @@ public class Trandon extends AbstractNpcAI takeItems(player, SUB_CERTIFICATE, -1); player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, npc); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { player.getVariables().remove(SUB_CERTIFICATE_COUNT_VAR + subclass.getClassId()); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java index 0f01060430..8d0d2376bf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java @@ -19,11 +19,11 @@ package ai.others.AlchemistManager; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 8edb057dd4..79f61014f1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -19,8 +19,8 @@ package ai.others.CastleAmbassador; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 2d648de940..ddc6ff9e74 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -37,9 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; @@ -48,6 +45,9 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 6501fcc558..ad39458983 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java index 7ffba9221f..18abb8dafe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleSideEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleSideEffect.java index 4a5e4b04b0..b1fd925efc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleSideEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleSideEffect.java @@ -18,7 +18,7 @@ package ai.others; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ExCastleState; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 6695d44df2..00fd04bfd7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 4057f61849..137a39ce78 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clanhallauction.Bidder; import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 595f8c88a0..b73a819176 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 22fbc5fbe1..822dcc2e68 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index a914efac75..4822c24427 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 7b497c1b38..a9ba427796 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java index 1b8c0cc50e..1ca2951ce7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java @@ -21,11 +21,11 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 86669cf7d3..33502c6fb1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.Mentee; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 51488eac53..b96b0d3460 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 449df36884..b8821136b1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -30,13 +30,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.handler.BypassHandler; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index dded92c215..f469c39159 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java index 174255624f..576eadf4f2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 22c7dd487b..3eeeafb2cd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 95d0581c29..e01a966fd4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -19,10 +19,10 @@ package custom.FakePlayers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.FakePlayerData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 597d7031c1..d4c850f564 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java index 33e960d44c..c61c07b685 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; public class ItemInstanceAction implements IActionHandler diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java index 1f204280f0..4b75e2bfb8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IActionHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index e51c05342a..b4d3c2a645 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StaticObject; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d61b3cd144..27c1e2cd73 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 04df6fcb37..45884c05ce 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java index 1dedada1f4..94348e020e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 1c1a282776..de7b086fb5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 83a120d8c4..e04d66f3e2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index dd70ccc79c..0d9b835f4c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -46,7 +47,6 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 462a5f4557..2d7e669ac4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.GameEvent.EventState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 77ae194287..3ccca7b46d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java index 298eecbede..014c8e7631 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 63cdf1ab2d..081bbe2c2b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -19,9 +19,9 @@ package handlers.bypasshandlers; import java.util.logging.Level; import org.l2jmobius.gameserver.handler.IBypassHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; public class EventEngine implements IBypassHandler { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 569c3b0883..7f3b1c4f76 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.handler.IWriteBoardHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index b174f935ff..467d6c462d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,12 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dafe04d202..894e1f3ed9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 0d1c34c7f1..eb768e547a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 3d3ca58f22..136183a12e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 5d27431c66..beb6e18018 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index e1b3e072c7..bc0212c92a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 27684a7f8a..19ed78fac4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index d7492d9b97..32107cf16c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ffcb045f63..0d3c9573e8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 29c2260378..99c4ca7cc7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index 512f140411..1517ea54c5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 66067f20a9..d2d4c45448 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -18,11 +18,11 @@ package handlers.skillconditionhandlers; import java.util.List; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 2c4160ec61..2531d33eae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -16,11 +16,11 @@ */ package handlers.skillconditionhandlers; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 4d99f48f53..6ece0fc678 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index ca2af837ab..35b27840c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 1ceaa4af0a..07ca155a52 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java index 7a0d9959c5..b906d68f89 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java index 9d53e1a686..b5f1d8e967 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.type.SiegeZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 21e5f69860..12378128cf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 3b67b71e46..4dedee6473 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; import instances.AbstractInstance; import quests.Q00512_BladeUnderFoot.Q00512_BladeUnderFoot; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 8054e0ed0d..b0ed1fc984 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -21,6 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 6af5a366aa..686b01379b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; import instances.AbstractInstance; import quests.Q00511_AwlUnderFoot.Q00511_AwlUnderFoot; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 177e234739..408e426ce5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 3640d0b5e4..b3de2f227a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 7fb6ab32db..8053c44084 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -16,9 +16,9 @@ */ package quests.Q00061_LawEnforcement; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 486056ca28..135a98ec78 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Awl Under Foot (511) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java index b666a96d4a..4c5c32a2cf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Blade Under Foot (512) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 66799f1982..5513e9ef4e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Light within the Darkness (726) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 6c44c24891..f3048633ee 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Hope within the Darkness (727) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java index 3e5f6c500d..0c10e7f9ae 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java @@ -16,11 +16,11 @@ */ package quests.Q00784_TheQuietKiller; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java index 6df29a5668..eb04bc787f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00785_ASuspiciousIngredient/Q00785_ASuspiciousIngredient.java @@ -16,11 +16,11 @@ */ package quests.Q00785_ASuspiciousIngredient; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index b9c68b1388..b52c921c8a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -19,11 +19,11 @@ package quests.Q10331_StartOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java index 5ba5e84c04..cd068906c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java @@ -17,12 +17,12 @@ package quests.Q10338_SeizeYourDestiny; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 50910ba20f..7c7505c5d7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -19,12 +19,12 @@ package quests.Q10360_CertificationOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index db1ae63ac7..bf8dc2bd25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10735_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 9c9a3b4737..c01aec6b3d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10736_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 43525550b4..4e672254dc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 14596da80f..905999c4a2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -18,13 +18,13 @@ package quests.Q10752_WindsOfFateAPromise; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 06f4cda8d2..076e8eac0a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 9444f7ed35..7f581a9ff1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -19,10 +19,10 @@ package quests.Q10790_AMercenaryHelper; import java.util.HashMap; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 6610038b7b..ea410f1105 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -16,12 +16,12 @@ */ package quests.Q10791_TheManOfMystery; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 86ffa34493..5bd5b1bc99 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index f56a4948eb..db4b63adb8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index 21d143da8b..9d958a3a21 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java index b09ed2e829..c7d8583889 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java @@ -59,9 +59,9 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/FortUpdater.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/FortUpdater.java index b984f26621..a502f222a1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/FortUpdater.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/FortUpdater.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Class managing periodical events with castle diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 7d184a9fda..0d3b20edaa 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -145,8 +145,8 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java index c5aae8dd33..e58b8b6e20 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 53b0e7cfd2..b3cb0d7e2d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -44,14 +44,14 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanWar; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index 5f36b093b2..283e2f0116 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClassListData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClassListData.java index e0835c9ce8..dca159e58e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClassListData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/ClassListData.java @@ -26,8 +26,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.ClassInfo; +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.holders.ClassInfoHolder; /** * Loads the the list of classes and it's info. @@ -37,7 +37,7 @@ public class ClassListData implements IXmlReader { private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName()); - private final Map _classData = new ConcurrentHashMap<>(); + private final Map _classData = new ConcurrentHashMap<>(); /** * Instantiates a new class list data. @@ -78,7 +78,7 @@ public class ClassListData implements IXmlReader className = attr.getNodeValue(); attr = attrs.getNamedItem("parentClassId"); parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null; - _classData.put(classId, new ClassInfo(classId, className, parentClassId)); + _classData.put(classId, new ClassInfoHolder(classId, className, parentClassId)); } } } @@ -89,7 +89,7 @@ public class ClassListData implements IXmlReader * Gets the class list. * @return the complete class list. */ - public Map getClassList() + public Map getClassList() { return _classData; } @@ -99,7 +99,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(ClassId classId) + public ClassInfoHolder getClass(ClassId classId) { return _classData.get(classId); } @@ -109,7 +109,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id as integer. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(int classId) + public ClassInfoHolder getClass(int classId) { final ClassId id = ClassId.getClassId(classId); return (id != null) ? _classData.get(id) : null; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java index bf8345d7cf..b98992d5bf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java @@ -28,10 +28,10 @@ import java.util.stream.Collectors; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java index ab5be1c99c..86d06999b3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 76d501328b..629cf7dc77 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 342d477cb7..1915d5a056 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -29,13 +29,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MacroType; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java index 19981c3d24..63010ebdfd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; /** * Loads player's base stats. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index cdae80bb3d..9d1cc99f37 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -38,15 +38,15 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java similarity index 92% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java index f98e8c4955..46f8021885 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Learning skill types. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/ClassId.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassId.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/ClassId.java index fdc2fffa68..b6f96a8c9c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/ClassId.java @@ -14,14 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/PlayerState.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/PlayerState.java similarity index 91% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/PlayerState.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/PlayerState.java index cb16dd5971..fc67134f9f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/PlayerState.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/PlayerState.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; public enum PlayerState { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SocialClass.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/SocialClass.java similarity index 91% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SocialClass.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/SocialClass.java index 3b86db6e1e..b479370447 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SocialClass.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/SocialClass.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Enumerated for Social Classes. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 6bc30f2206..2618c1b7b1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager implements InstanceListManager { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e9aac43188..3d8c1f50e4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.interfaces.IStorable; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java index 1daea8553c..781c07913c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -38,11 +38,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.CommissionManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.commission.CommissionItem; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java index 054c6f4bcc..dd530dd6d3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java @@ -30,9 +30,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ba7e62a8c9..f033cf2f76 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -31,13 +31,13 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; @@ -112,7 +112,7 @@ public class DailyTaskManager extends AbstractEventManager> for (PlayerInstance player : World.getInstance().getPlayers()) { player.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS, false); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { subclass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index a551a07de0..233bea17ac 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 30b289b8b6..767c90e4ba 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.InstanceListManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; public class FortManager implements InstanceListManager { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index b5718c1ebd..cbc70a9567 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,9 +38,9 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MailManager.java index 2a82541b39..8fa771c248 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MailManager.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import org.l2jmobius.gameserver.network.serverpackets.ExUnReadMailCount; import org.l2jmobius.gameserver.taskmanager.MessageDeletionTaskManager; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 0b7b56439c..920d974e48 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java index aa5fe75760..b3d0504beb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java @@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MatchingRoomType; import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.matching.MatchingRoom; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index a926d9b04b..78cf922b7f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Siege Guard Manager. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index d65e7ac73a..b06a6774aa 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.TowerSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; public class SiegeManager diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/GameEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/GameEvent.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java index b8c0608bd1..c0cc276691 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/GameEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.events; import java.io.BufferedReader; import java.io.FileReader; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 60e691a19c..687d1288b9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.games; import java.util.Map; import java.util.Map.Entry; @@ -54,9 +54,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author BiggBoss */ -public class BlockCheckerEngine +public class BlockChecker { - protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockChecker.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -127,7 +127,7 @@ public class BlockCheckerEngine // Preserve from exploit reward by logging out protected boolean _abnormalEnd = false; - public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) + public BlockChecker(ArenaParticipantsHolder holder, int arena) { _holder = holder; if ((arena > -1) && (arena < 4)) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index e9b0a4dbfc..5da780a150 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,14 +34,14 @@ public class ArenaParticipantsHolder private final int _arena; private final List _redPlayers; private final List _bluePlayers; - private final BlockCheckerEngine _engine; + private final BlockChecker _engine; public ArenaParticipantsHolder(int arena) { _arena = arena; _redPlayers = new ArrayList<>(6); _bluePlayers = new ArrayList<>(6); - _engine = new BlockCheckerEngine(this, _arena); + _engine = new BlockChecker(this, _arena); } public List getRedPlayers() @@ -130,7 +130,7 @@ public class ArenaParticipantsHolder _bluePlayers.clear(); } - public BlockCheckerEngine getEvent() + public BlockChecker getEvent() { return _engine; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Couple.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Couple.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Couple.java index 54104ff7ab..dbca7d1e97 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Couple.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 22bc00c260..b1b9f3d2ac 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model; import java.util.List; import java.util.function.Function; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.handler.DailyMissionHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Duel.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java index 1d117e44d8..65eddcbb0c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Duel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.util.Calendar; import java.util.List; @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.enums.Team; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Message.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Message.java similarity index 95% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Message.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Message.java index 97d24eb1c8..e6b1c31d32 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Message.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Message.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java index 2a32e32d54..5eb90fb4ef 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.base.SocialClass; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8e563987ca..a52a2c2e21 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -56,7 +56,6 @@ import org.l2jmobius.gameserver.model.actor.status.AttackableStatus; import org.l2jmobius.gameserver.model.actor.tasks.attackable.CommandChannelTimer; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAggroRangeEnter; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttack; @@ -66,6 +65,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3ebe6eb63a..62f1d1049f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -61,9 +61,6 @@ import org.l2jmobius.gameserver.model.actor.instance.WarehouseInstance; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcCanBeSeen; @@ -80,6 +77,9 @@ import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java index 4698bfdcf8..7eacda4aa1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; @@ -51,7 +51,7 @@ public class BlockInstance extends MonsterInstance // Do not update color while sending old info synchronized (this) { - final BlockCheckerEngine event = holder.getEvent(); + final BlockChecker event = holder.getEvent(); if (_colorEffect == 0x53) { // Change color @@ -137,7 +137,7 @@ public class BlockInstance extends MonsterInstance } } - private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockCheckerEngine eng) + private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockChecker eng) { eng.increasePlayerPoints(player, team); @@ -149,7 +149,7 @@ public class BlockInstance extends MonsterInstance eng.getHolder().broadCastPacketToTeam(secretPoints); } - private void dropItem(int id, BlockCheckerEngine eng, PlayerInstance player) + private void dropItem(int id, BlockChecker eng, PlayerInstance player) { final ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); final int x = getX() + Rnd.get(50); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java index b882c183a6..0b025e1f03 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index 975d847005..d5d0a599f6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 21141aa0a5..3602d314ee 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index a9e7ce65a2..8c3be792ee 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 588e4d6da9..3d16b348a2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.FolkStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7023c92253..dfac46c380 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -84,6 +84,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ClanWarState; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; @@ -123,11 +124,13 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.SellBuffsManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.ContactList; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; @@ -177,8 +180,6 @@ import org.l2jmobius.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask; import org.l2jmobius.gameserver.model.actor.tasks.player.WaterTask; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -187,12 +188,6 @@ import org.l2jmobius.gameserver.model.clan.ClanWar; import org.l2jmobius.gameserver.model.cubic.CubicInstance; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Duel; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Hero; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; @@ -224,6 +219,7 @@ import org.l2jmobius.gameserver.model.holders.PlayerEventHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; @@ -245,6 +241,7 @@ import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -254,6 +251,9 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -445,7 +445,7 @@ public class PlayerInstance extends Playable private boolean _petItems = false; /** The list of sub-classes this character has. */ - private final Map _subClasses = new ConcurrentHashMap<>(); + private final Map _subClasses = new ConcurrentHashMap<>(); private static final String ORIGINAL_CLASS_VAR = "OriginalClass"; @@ -6613,7 +6613,7 @@ public class PlayerInstance extends Playable // Restore Subclass Data (cannot be done earlier in function) if (restoreSubClassData(player) && (activeClassId != player.getBaseClass())) { - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass.getClassId() == activeClassId) { @@ -6833,7 +6833,7 @@ public class PlayerInstance extends Playable { while (rset.next()) { - final SubClass subClass = new SubClass(); + final SubClassHolder subClass = new SubClassHolder(); subClass.setClassId(rset.getInt("class_id")); subClass.setDualClassActive(rset.getBoolean("dual_class")); subClass.setVitalityPoints(rset.getInt("vitality_points")); @@ -7147,7 +7147,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(UPDATE_CHAR_SUBCLASS)) { - for (SubClass subClass : getSubClasses().values()) + for (SubClassHolder subClass : getSubClasses().values()) { statement.setLong(1, subClass.getExp()); statement.setLong(2, subClass.getSp()); @@ -9538,7 +9538,7 @@ public class PlayerInstance extends Playable // Note: Never change _classIndex in any method other than setActiveClass(). - final SubClass newClass = new SubClass(); + final SubClassHolder newClass = new SubClassHolder(); newClass.setClassId(classId); newClass.setClassIndex(classIndex); newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); @@ -9629,7 +9629,7 @@ public class PlayerInstance extends Playable EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); } - final SubClass subClass = getSubClasses().get(classIndex); + final SubClassHolder subClass = getSubClasses().get(classIndex); if (subClass == null) { return false; @@ -9728,7 +9728,7 @@ public class PlayerInstance extends Playable { return false; } - final SubClass subClass = _subClasses.get(_classIndex); + final SubClassHolder subClass = _subClasses.get(_classIndex); if (subClass == null) { return false; @@ -9738,7 +9738,7 @@ public class PlayerInstance extends Playable public boolean hasDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9748,9 +9748,9 @@ public class PlayerInstance extends Playable return false; } - public SubClass getDualClass() + public SubClassHolder getDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9760,7 +9760,7 @@ public class PlayerInstance extends Playable return null; } - public Map getSubClasses() + public Map getSubClasses() { return _subClasses; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 217fb1c4b0..0607b51090 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.SiegeFlagStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index edad148a46..7d586645f8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -24,6 +24,7 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -32,12 +33,11 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java index 59f438128f..fd5f1052e6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; public class NpcStatus extends CreatureStatus { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index 0976283d6d..e3b931cdd3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.DuelManager; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 6c305ffe1b..341ed13771 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 782dca3687..f2acbb5d8a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -22,9 +22,9 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java index 746832fd57..03ed8d9158 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author Sdw diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index f27bfd1912..df4177e12b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 3466416f97..8fc4eaaad2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index cba6999dc2..17a8de9fd3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 6b4fb92953..cee0537b63 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 7f5b51a8f9..07282525cd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 81a9539d78..c5cad7593a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index c020f982f3..6a9ce6b0e4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.conditions; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2e67022ea7..3233eacd28 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index c1f1a70c2d..7d8f8d63f7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; @@ -64,9 +65,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.Ids; import org.l2jmobius.gameserver.model.events.annotations.NpcLevelRange; @@ -145,6 +143,8 @@ import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java index 655a3fb505..0c73b7dfa2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.creature.player; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java index 0ca3450101..880ee008a0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java index 9f1e438d15..7f93a263ef 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java index 0e13607419..47c5ea3720 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java index 9e81e6f036..1e9ef8a3e1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java index c0d9c21d7d..a9d480bbc0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java similarity index 88% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassInfo.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java index f4cfcb60c5..cb1c49612e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/ClassInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java @@ -14,15 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import java.util.regex.Matcher; +import org.l2jmobius.gameserver.enums.ClassId; + /** * This class will hold the information of the player classes. * @author Zoey76 */ -public class ClassInfo +public class ClassInfoHolder { private final ClassId _classId; private final String _className; @@ -34,7 +36,7 @@ public class ClassInfo * @param className the in game class name. * @param parentClassId the parent class for the given {@code classId}. */ - public ClassInfo(ClassId classId, String className, ClassId parentClassId) + public ClassInfoHolder(ClassId classId, String className, ClassId parentClassId) { _classId = classId; _className = className; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java similarity index 91% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java index 7c18ab192e..91b3f75228 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java @@ -14,17 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; /** * Character Sub-Class Definition
* Used to store key information about a character's sub-class. * @author Tempy */ -public class SubClass +public class SubClassHolder { private static final byte MAX_LEVEL = Config.MAX_SUBCLASS_LEVEL < ExperienceData.getInstance().getMaxLevel() ? Config.MAX_SUBCLASS_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1); @@ -39,7 +40,7 @@ public class SubClass private int _vitalityPoints = 0; private boolean _dualClass = false; - public SubClass() + public SubClassHolder() { // Used for specifying ALL attributes of a sub class directly, // using the preset default values. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java index 56dd78243c..426a12682a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,8 +21,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 92b3bb052b..44c4234359 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -62,7 +62,6 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; @@ -80,6 +79,7 @@ import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5d13146ab0..bed9045612 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.olympiad; import java.sql.Connection; import java.sql.PreparedStatement; @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 65302ee1c3..d824e494ed 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -47,7 +47,6 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java index 3a6174537f..a3b52b27e7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -40,7 +40,9 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.TrapAction; @@ -54,8 +56,6 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index 50b91578e3..cf665da8f8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -30,9 +30,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.zone.type.ResidenceZone; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2da8cf9508..a292c439e5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java index 3bf01c04ea..8aa51ae1d1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Fort.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java index 4b535778a2..e55f1b4a2f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/FortSiege.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/FortSiege.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e1c798b801..4788e0f6fe 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siegable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siegable.java similarity index 93% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siegable.java index a450298acc..6976ee8a47 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siegable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siegable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.util.Calendar; import java.util.Collection; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java rename to L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java index fda6e52be6..25e8b587a3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; @@ -60,6 +60,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 3637bfe805..c7b80987c7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -28,14 +28,14 @@ import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java index d09ad19b54..c3ac06e1fc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 73d3e8ddf5..354d6d853d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index 1d9657b72b..13b533a54f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.TaskZoneSettings; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java index 9f749f9a6e..5a3805fae0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index f70c352a0e..c984d97cd6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java index d898d2c397..6dcd5de9a1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 521e4ad7bb..57e75ae3e9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.InitialShortcutData; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; @@ -35,7 +36,6 @@ import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4277445f46..09bf4d44b6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -43,21 +43,21 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PetitionManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 654c95780e..9bb35cb7fa 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; -import org.l2jmobius.gameserver.model.base.ClassId; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a9ee6b70d9..a39e330d4c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -22,6 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.enums.Race; @@ -32,14 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; @@ -568,7 +568,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getDualClassLevel() > 0) { - final SubClass playerDualClass = player.getDualClass(); + final SubClassHolder playerDualClass = player.getDualClass(); if ((playerDualClass == null) || (playerDualClass.getLevel() < skillLearn.getDualClassLevel())) { return false; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 828b38864b..0d5672fb40 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 5001cf8b8e..5d0fbf40ba 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8fc855eca0..1e87455cc7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index abb645f985..ef8b2cf963 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 81dbb0d704..52863e1fd5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 8838fefa65..981996d4c2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 2834a27ebd..272e2f7fe6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 8f0bfcd431..05e09e6dfc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java index bf37f72ae5..b2f32527da 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 19d94c2585..715be58f93 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java index 4c0af8accc..84d38a443a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; import org.l2jmobius.commons.network.PacketReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 122d60272e..7f0e32b31e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 2aaa26b599..7d42393a58 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index ce9f7f44ec..f8ce2b0922 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 9b655cdc92..940cbd3169 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 283983cc6b..30e0b1b097 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -27,16 +27,16 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.Event; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 398ca12513..458046879d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index ec7007f7b9..4f70ca3668 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 107afbb395..0e7b4529e5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java index 34370c05ee..097e8f5d30 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java index ba4f579ddc..6df5163c58 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java index d8b35ee5a3..56f921bcab 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index c2fc4effe6..f6702caa41 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java index 6ee22ecbb0..8f97156f15 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index b06bbe7583..be68d42341 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 203854a8c0..3d741a86a6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index 70635ff95b..a4f7617e60 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 6b8c0d64e9..2b43c0ce4b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.CastleSide; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index bfdaecf6b9..71754ea3ca 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index dd6984a815..a40690e845 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 3200220765..993f77ec6b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 0e2325e231..7f8a08691c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index f7f1953506..1e06cc2a3f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 7bacef1cfc..82554fdc5f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 778bd1e898..7a9f6f7389 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 176e9b44d1..ee9fa9fd37 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index b17a294893..f389b26ed5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 33d1abccb9..27da99cf41 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index fe4407474e..3e3765eed2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index db4e099d22..3656ddbc4e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index 6f728b4fe4..2ae09181a7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index a9d9c157f7..04e0f46871 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -43,7 +43,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket _type = type.ordinal(); _subs = new ArrayList<>(); _subs.add(0, new SubInfo(player)); - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { _subs.add(new SubInfo(sub)); } @@ -56,7 +56,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket private final int _level; private final int _type; - public SubInfo(SubClass sub) + public SubInfo(SubClassHolder sub) { _index = sub.getClassIndex(); _classId = sub.getClassId(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 855d3d5fb0..66eccc7fbf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index cc12b05bc8..5d5c831f14 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 01dcc0ed18..5ed678042b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 9de3c0baba..d1a4c1f73b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,11 +20,11 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index 05638be656..eb0dd7a59f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java index f93fdd9c13..d95f42827a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.taskmanager.Task; import org.l2jmobius.gameserver.taskmanager.TaskManager; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java index f9e85c9134..ab7570016e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index f1d9eb0f66..2f1b8d574d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -20,10 +20,10 @@ import java.util.List; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4f1884483e..3066ed9084 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -24,13 +24,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChangeToAwakenedClass; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index c0e54a4fe0..8e2ecfdbda 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -23,12 +23,12 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index ebf3864210..371e8b6efc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -19,12 +19,12 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 204b9a5667..e3bd131843 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -31,18 +31,18 @@ import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -243,7 +243,7 @@ public class Raina extends AbstractNpcAI { final StringBuilder sb = new StringBuilder(); final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "subclassRemoveList.html"); - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass != null) { @@ -673,7 +673,7 @@ public class Raina extends AbstractNpcAI // scan for already used subclasses final int availClassId = pclass.getId(); final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { final ClassId subId = ClassId.getClassId(subList.getClassId()); if (subId.equalsOrChildOf(cid)) @@ -703,7 +703,7 @@ public class Raina extends AbstractNpcAI { final ClassId cid = ClassId.getClassId(classId); ClassId subClassId; - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { subClassId = ClassId.getClassId(subList.getClassId()); if (subClassId.equalsOrChildOf(cid)) @@ -739,7 +739,7 @@ public class Raina extends AbstractNpcAI private boolean hasAllSubclassLeveled(PlayerInstance player) { boolean leveled = true; - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { if ((sub != null) && (sub.getLevel() < 75)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 2c512b361f..123a96820d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; @@ -210,7 +210,7 @@ public class Trandon extends AbstractNpcAI takeItems(player, SUB_CERTIFICATE, -1); player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, npc); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { player.getVariables().remove(SUB_CERTIFICATE_COUNT_VAR + subclass.getClassId()); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java index 0f01060430..8d0d2376bf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java @@ -19,11 +19,11 @@ package ai.others.AlchemistManager; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 8edb057dd4..79f61014f1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -19,8 +19,8 @@ package ai.others.CastleAmbassador; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 2d648de940..ddc6ff9e74 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -37,9 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; @@ -48,6 +45,9 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 6501fcc558..ad39458983 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java index 7ffba9221f..18abb8dafe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleSideEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleSideEffect.java index 4a5e4b04b0..b1fd925efc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleSideEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleSideEffect.java @@ -18,7 +18,7 @@ package ai.others; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ExCastleState; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 6695d44df2..00fd04bfd7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 4057f61849..a7e5e42043 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.Bidder; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 595f8c88a0..b73a819176 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 22fbc5fbe1..822dcc2e68 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 530be1e85b..a6fdab323a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 7b497c1b38..a9ba427796 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java index 1b8c0cc50e..1ca2951ce7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java @@ -21,11 +21,11 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 86669cf7d3..33502c6fb1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.Mentee; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 51488eac53..b96b0d3460 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 449df36884..b8821136b1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -30,13 +30,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.handler.BypassHandler; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index dded92c215..f469c39159 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java index 174255624f..576eadf4f2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 22c7dd487b..3eeeafb2cd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 95d0581c29..e01a966fd4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -19,10 +19,10 @@ package custom.FakePlayers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.FakePlayerData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 597d7031c1..d4c850f564 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java index 33e960d44c..c61c07b685 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; public class ItemInstanceAction implements IActionHandler diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java index 1f204280f0..4b75e2bfb8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IActionHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index e51c05342a..b4d3c2a645 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StaticObject; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d61b3cd144..27c1e2cd73 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 04df6fcb37..45884c05ce 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java index 1dedada1f4..94348e020e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 1c1a282776..de7b086fb5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 83a120d8c4..e04d66f3e2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index dd70ccc79c..0d9b835f4c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -46,7 +47,6 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 462a5f4557..2d7e669ac4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.GameEvent.EventState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 77ae194287..3ccca7b46d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java index 298eecbede..014c8e7631 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 63cdf1ab2d..081bbe2c2b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -19,9 +19,9 @@ package handlers.bypasshandlers; import java.util.logging.Level; import org.l2jmobius.gameserver.handler.IBypassHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; public class EventEngine implements IBypassHandler { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 569c3b0883..7f3b1c4f76 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.handler.IWriteBoardHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index b174f935ff..467d6c462d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,12 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dafe04d202..894e1f3ed9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 0d1c34c7f1..eb768e547a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 3d3ca58f22..136183a12e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 5d27431c66..beb6e18018 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index e1b3e072c7..bc0212c92a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 27684a7f8a..19ed78fac4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index d7492d9b97..32107cf16c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index 449bc316f8..958e0b623d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ffcb045f63..0d3c9573e8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 29c2260378..99c4ca7cc7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index 512f140411..1517ea54c5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 66067f20a9..d2d4c45448 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -18,11 +18,11 @@ package handlers.skillconditionhandlers; import java.util.List; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 2c4160ec61..2531d33eae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -16,11 +16,11 @@ */ package handlers.skillconditionhandlers; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 4d99f48f53..6ece0fc678 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index ca2af837ab..35b27840c0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 1ceaa4af0a..07ca155a52 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java index 7a0d9959c5..b906d68f89 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java index 9d53e1a686..b5f1d8e967 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.type.SiegeZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 21e5f69860..12378128cf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 3b67b71e46..4dedee6473 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; import instances.AbstractInstance; import quests.Q00512_BladeUnderFoot.Q00512_BladeUnderFoot; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 8054e0ed0d..b0ed1fc984 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -21,6 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 6af5a366aa..686b01379b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; import instances.AbstractInstance; import quests.Q00511_AwlUnderFoot.Q00511_AwlUnderFoot; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 177e234739..408e426ce5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 3640d0b5e4..b3de2f227a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 7fb6ab32db..8053c44084 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -16,9 +16,9 @@ */ package quests.Q00061_LawEnforcement; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 486056ca28..135a98ec78 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Awl Under Foot (511) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java index b666a96d4a..4c5c32a2cf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Blade Under Foot (512) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 66799f1982..5513e9ef4e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Light within the Darkness (726) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 6c44c24891..f3048633ee 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Hope within the Darkness (727) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index 987ef3262a..084d402d9e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -18,11 +18,11 @@ package quests.Q10331_StartOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java index 5ba5e84c04..cd068906c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java @@ -17,12 +17,12 @@ package quests.Q10338_SeizeYourDestiny; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 4515b12361..9f439636ea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -19,12 +19,12 @@ package quests.Q10360_CertificationOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java index a48d9ead70..62692efdab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java @@ -16,11 +16,11 @@ */ package quests.Q10521_QueenNavarisLetterVarkaSilenosBarracks; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java index bfb4cce216..25f8500ec1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java @@ -16,11 +16,11 @@ */ package quests.Q10525_QueenNavarisLetterKetraOrcOutpost; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index db1ae63ac7..bf8dc2bd25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10735_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 9c9a3b4737..c01aec6b3d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10736_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 5eca08c242..9051757a12 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 6cbe9ae611..7f2401e1dc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -18,13 +18,13 @@ package quests.Q10752_WindsOfFateAPromise; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 9a2a74229b..feaf60cc75 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index b8f38e8815..8abe352c86 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -19,11 +19,11 @@ package quests.Q10790_AMercenaryHelper; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 6610038b7b..ea410f1105 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -16,12 +16,12 @@ */ package quests.Q10791_TheManOfMystery; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index a6f9c3f47c..8adbb1ef72 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index f56a4948eb..db4b63adb8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index 21d143da8b..9d958a3a21 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java index 56f580a8b5..44291b2dfb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java @@ -59,9 +59,9 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/FortUpdater.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/FortUpdater.java index b984f26621..a502f222a1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/FortUpdater.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/FortUpdater.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Class managing periodical events with castle diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 7d184a9fda..0d3b20edaa 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -145,8 +145,8 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java index c5aae8dd33..e58b8b6e20 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 098dc6eb1e..5fb42b9474 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -45,14 +45,14 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanWar; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index 5f36b093b2..283e2f0116 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClassListData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClassListData.java index e0835c9ce8..dca159e58e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClassListData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/ClassListData.java @@ -26,8 +26,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.ClassInfo; +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.holders.ClassInfoHolder; /** * Loads the the list of classes and it's info. @@ -37,7 +37,7 @@ public class ClassListData implements IXmlReader { private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName()); - private final Map _classData = new ConcurrentHashMap<>(); + private final Map _classData = new ConcurrentHashMap<>(); /** * Instantiates a new class list data. @@ -78,7 +78,7 @@ public class ClassListData implements IXmlReader className = attr.getNodeValue(); attr = attrs.getNamedItem("parentClassId"); parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null; - _classData.put(classId, new ClassInfo(classId, className, parentClassId)); + _classData.put(classId, new ClassInfoHolder(classId, className, parentClassId)); } } } @@ -89,7 +89,7 @@ public class ClassListData implements IXmlReader * Gets the class list. * @return the complete class list. */ - public Map getClassList() + public Map getClassList() { return _classData; } @@ -99,7 +99,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(ClassId classId) + public ClassInfoHolder getClass(ClassId classId) { return _classData.get(classId); } @@ -109,7 +109,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id as integer. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(int classId) + public ClassInfoHolder getClass(int classId) { final ClassId id = ClassId.getClassId(classId); return (id != null) ? _classData.get(id) : null; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java index bf8345d7cf..b98992d5bf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java @@ -28,10 +28,10 @@ import java.util.stream.Collectors; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java index ab5be1c99c..86d06999b3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 76d501328b..629cf7dc77 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 342d477cb7..1915d5a056 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -29,13 +29,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MacroType; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java index 19981c3d24..63010ebdfd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; /** * Loads player's base stats. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index cdae80bb3d..9d1cc99f37 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -38,15 +38,15 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java similarity index 92% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java index f98e8c4955..46f8021885 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Learning skill types. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/ClassId.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassId.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/ClassId.java index fdc2fffa68..b6f96a8c9c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/ClassId.java @@ -14,14 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/PlayerState.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/PlayerState.java similarity index 91% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/PlayerState.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/PlayerState.java index cb16dd5971..fc67134f9f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/PlayerState.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/PlayerState.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; public enum PlayerState { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SocialClass.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/SocialClass.java similarity index 91% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SocialClass.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/SocialClass.java index 3b86db6e1e..b479370447 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SocialClass.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/SocialClass.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Enumerated for Social Classes. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 6bc30f2206..2618c1b7b1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager implements InstanceListManager { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e9aac43188..3d8c1f50e4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.interfaces.IStorable; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java index 1daea8553c..781c07913c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -38,11 +38,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.CommissionManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.commission.CommissionItem; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java index 054c6f4bcc..dd530dd6d3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java @@ -30,9 +30,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ba7e62a8c9..f033cf2f76 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -31,13 +31,13 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; @@ -112,7 +112,7 @@ public class DailyTaskManager extends AbstractEventManager> for (PlayerInstance player : World.getInstance().getPlayers()) { player.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS, false); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { subclass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index a551a07de0..233bea17ac 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 30b289b8b6..767c90e4ba 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.InstanceListManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; public class FortManager implements InstanceListManager { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index b5718c1ebd..cbc70a9567 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,9 +38,9 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MailManager.java index 2a82541b39..8fa771c248 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MailManager.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import org.l2jmobius.gameserver.network.serverpackets.ExUnReadMailCount; import org.l2jmobius.gameserver.taskmanager.MessageDeletionTaskManager; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 0b7b56439c..920d974e48 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java index aa5fe75760..b3d0504beb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java @@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MatchingRoomType; import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.matching.MatchingRoom; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index a926d9b04b..78cf922b7f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Siege Guard Manager. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index d65e7ac73a..b06a6774aa 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.TowerSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; public class SiegeManager diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/GameEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/GameEvent.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java index b8c0608bd1..c0cc276691 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/GameEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.events; import java.io.BufferedReader; import java.io.FileReader; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 60e691a19c..687d1288b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.games; import java.util.Map; import java.util.Map.Entry; @@ -54,9 +54,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author BiggBoss */ -public class BlockCheckerEngine +public class BlockChecker { - protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockChecker.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -127,7 +127,7 @@ public class BlockCheckerEngine // Preserve from exploit reward by logging out protected boolean _abnormalEnd = false; - public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) + public BlockChecker(ArenaParticipantsHolder holder, int arena) { _holder = holder; if ((arena > -1) && (arena < 4)) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index e9b0a4dbfc..5da780a150 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,14 +34,14 @@ public class ArenaParticipantsHolder private final int _arena; private final List _redPlayers; private final List _bluePlayers; - private final BlockCheckerEngine _engine; + private final BlockChecker _engine; public ArenaParticipantsHolder(int arena) { _arena = arena; _redPlayers = new ArrayList<>(6); _bluePlayers = new ArrayList<>(6); - _engine = new BlockCheckerEngine(this, _arena); + _engine = new BlockChecker(this, _arena); } public List getRedPlayers() @@ -130,7 +130,7 @@ public class ArenaParticipantsHolder _bluePlayers.clear(); } - public BlockCheckerEngine getEvent() + public BlockChecker getEvent() { return _engine; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Couple.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Couple.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Couple.java index 54104ff7ab..dbca7d1e97 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Couple.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 22bc00c260..b1b9f3d2ac 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model; import java.util.List; import java.util.function.Function; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.handler.DailyMissionHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Duel.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java index 1d117e44d8..65eddcbb0c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Duel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.util.Calendar; import java.util.List; @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.enums.Team; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Message.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Message.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Message.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Message.java index 97d24eb1c8..e6b1c31d32 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Message.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Message.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java index 2a32e32d54..5eb90fb4ef 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.base.SocialClass; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8e563987ca..a52a2c2e21 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -56,7 +56,6 @@ import org.l2jmobius.gameserver.model.actor.status.AttackableStatus; import org.l2jmobius.gameserver.model.actor.tasks.attackable.CommandChannelTimer; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAggroRangeEnter; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttack; @@ -66,6 +65,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3ebe6eb63a..62f1d1049f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -61,9 +61,6 @@ import org.l2jmobius.gameserver.model.actor.instance.WarehouseInstance; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcCanBeSeen; @@ -80,6 +77,9 @@ import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java index 4698bfdcf8..7eacda4aa1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; @@ -51,7 +51,7 @@ public class BlockInstance extends MonsterInstance // Do not update color while sending old info synchronized (this) { - final BlockCheckerEngine event = holder.getEvent(); + final BlockChecker event = holder.getEvent(); if (_colorEffect == 0x53) { // Change color @@ -137,7 +137,7 @@ public class BlockInstance extends MonsterInstance } } - private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockCheckerEngine eng) + private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockChecker eng) { eng.increasePlayerPoints(player, team); @@ -149,7 +149,7 @@ public class BlockInstance extends MonsterInstance eng.getHolder().broadCastPacketToTeam(secretPoints); } - private void dropItem(int id, BlockCheckerEngine eng, PlayerInstance player) + private void dropItem(int id, BlockChecker eng, PlayerInstance player) { final ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); final int x = getX() + Rnd.get(50); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java index b882c183a6..0b025e1f03 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index 975d847005..d5d0a599f6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 21141aa0a5..3602d314ee 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index a9e7ce65a2..8c3be792ee 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 588e4d6da9..3d16b348a2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.FolkStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 04c17eb2fe..78e74d3d4c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -84,6 +84,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ClanWarState; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.HtmlActionScope; @@ -124,11 +125,13 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.SellBuffsManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.ContactList; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; @@ -178,8 +181,6 @@ import org.l2jmobius.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask; import org.l2jmobius.gameserver.model.actor.tasks.player.WaterTask; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -188,12 +189,6 @@ import org.l2jmobius.gameserver.model.clan.ClanWar; import org.l2jmobius.gameserver.model.cubic.CubicInstance; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Duel; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Hero; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; @@ -225,6 +220,7 @@ import org.l2jmobius.gameserver.model.holders.PlayerEventHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; @@ -246,6 +242,7 @@ import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -255,6 +252,9 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -447,7 +447,7 @@ public class PlayerInstance extends Playable private boolean _petItems = false; /** The list of sub-classes this character has. */ - private final Map _subClasses = new ConcurrentHashMap<>(); + private final Map _subClasses = new ConcurrentHashMap<>(); private static final String ORIGINAL_CLASS_VAR = "OriginalClass"; @@ -6615,7 +6615,7 @@ public class PlayerInstance extends Playable // Restore Subclass Data (cannot be done earlier in function) if (restoreSubClassData(player) && (activeClassId != player.getBaseClass())) { - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass.getClassId() == activeClassId) { @@ -6835,7 +6835,7 @@ public class PlayerInstance extends Playable { while (rset.next()) { - final SubClass subClass = new SubClass(); + final SubClassHolder subClass = new SubClassHolder(); subClass.setClassId(rset.getInt("class_id")); subClass.setDualClassActive(rset.getBoolean("dual_class")); subClass.setVitalityPoints(rset.getInt("vitality_points")); @@ -7149,7 +7149,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(UPDATE_CHAR_SUBCLASS)) { - for (SubClass subClass : getSubClasses().values()) + for (SubClassHolder subClass : getSubClasses().values()) { statement.setLong(1, subClass.getExp()); statement.setLong(2, subClass.getSp()); @@ -9540,7 +9540,7 @@ public class PlayerInstance extends Playable // Note: Never change _classIndex in any method other than setActiveClass(). - final SubClass newClass = new SubClass(); + final SubClassHolder newClass = new SubClassHolder(); newClass.setClassId(classId); newClass.setClassIndex(classIndex); newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); @@ -9631,7 +9631,7 @@ public class PlayerInstance extends Playable EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); } - final SubClass subClass = getSubClasses().get(classIndex); + final SubClassHolder subClass = getSubClasses().get(classIndex); if (subClass == null) { return false; @@ -9730,7 +9730,7 @@ public class PlayerInstance extends Playable { return false; } - final SubClass subClass = _subClasses.get(_classIndex); + final SubClassHolder subClass = _subClasses.get(_classIndex); if (subClass == null) { return false; @@ -9740,7 +9740,7 @@ public class PlayerInstance extends Playable public boolean hasDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9750,9 +9750,9 @@ public class PlayerInstance extends Playable return false; } - public SubClass getDualClass() + public SubClassHolder getDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9762,7 +9762,7 @@ public class PlayerInstance extends Playable return null; } - public Map getSubClasses() + public Map getSubClasses() { return _subClasses; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 217fb1c4b0..0607b51090 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.SiegeFlagStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index edad148a46..7d586645f8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -24,6 +24,7 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -32,12 +33,11 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java index 59f438128f..fd5f1052e6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; public class NpcStatus extends CreatureStatus { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index 0976283d6d..e3b931cdd3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.DuelManager; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 6c305ffe1b..341ed13771 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 782dca3687..f2acbb5d8a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -22,9 +22,9 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index f27bfd1912..df4177e12b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 3466416f97..8fc4eaaad2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index cba6999dc2..17a8de9fd3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 6b4fb92953..cee0537b63 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 7f5b51a8f9..07282525cd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 81a9539d78..c5cad7593a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index c020f982f3..6a9ce6b0e4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.conditions; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2e67022ea7..3233eacd28 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index a767df0bc1..8f195b1ba9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -52,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; @@ -65,9 +66,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.Ids; import org.l2jmobius.gameserver.model.events.annotations.NpcLevelRange; @@ -146,6 +144,8 @@ import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java index 655a3fb505..0c73b7dfa2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.creature.player; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java index 0ca3450101..880ee008a0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java index 9f1e438d15..7f93a263ef 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java index 0e13607419..47c5ea3720 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java index 9e81e6f036..1e9ef8a3e1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java index c0d9c21d7d..a9d480bbc0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java similarity index 88% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassInfo.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java index f4cfcb60c5..cb1c49612e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/ClassInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java @@ -14,15 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import java.util.regex.Matcher; +import org.l2jmobius.gameserver.enums.ClassId; + /** * This class will hold the information of the player classes. * @author Zoey76 */ -public class ClassInfo +public class ClassInfoHolder { private final ClassId _classId; private final String _className; @@ -34,7 +36,7 @@ public class ClassInfo * @param className the in game class name. * @param parentClassId the parent class for the given {@code classId}. */ - public ClassInfo(ClassId classId, String className, ClassId parentClassId) + public ClassInfoHolder(ClassId classId, String className, ClassId parentClassId) { _classId = classId; _className = className; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java similarity index 91% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java index 7c18ab192e..91b3f75228 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java @@ -14,17 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; /** * Character Sub-Class Definition
* Used to store key information about a character's sub-class. * @author Tempy */ -public class SubClass +public class SubClassHolder { private static final byte MAX_LEVEL = Config.MAX_SUBCLASS_LEVEL < ExperienceData.getInstance().getMaxLevel() ? Config.MAX_SUBCLASS_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1); @@ -39,7 +40,7 @@ public class SubClass private int _vitalityPoints = 0; private boolean _dualClass = false; - public SubClass() + public SubClassHolder() { // Used for specifying ALL attributes of a sub class directly, // using the preset default values. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java index 56dd78243c..426a12682a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,8 +21,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 92b3bb052b..44c4234359 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -62,7 +62,6 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; @@ -80,6 +79,7 @@ import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5d13146ab0..bed9045612 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.olympiad; import java.sql.Connection; import java.sql.PreparedStatement; @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 65302ee1c3..d824e494ed 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -47,7 +47,6 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java index ecec5a7bcf..b5decfbdff 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -40,7 +40,9 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; @@ -55,8 +57,6 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index 50b91578e3..cf665da8f8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -30,9 +30,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.zone.type.ResidenceZone; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/Bidder.java similarity index 92% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/Bidder.java index 24b8576a12..f4d30762c2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/Bidder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.time.Instant; import java.time.ZoneId; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2da8cf9508..a292c439e5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java similarity index 94% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 746832fd57..2fa683814d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java index 3bf01c04ea..8aa51ae1d1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Fort.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java index 4b535778a2..e55f1b4a2f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/FortSiege.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/FortSiege.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e1c798b801..4788e0f6fe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siegable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siegable.java similarity index 93% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siegable.java index a450298acc..6976ee8a47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siegable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siegable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.util.Calendar; import java.util.Collection; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java rename to L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java index fda6e52be6..25e8b587a3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; @@ -60,6 +60,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 3637bfe805..c7b80987c7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -28,14 +28,14 @@ import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java index d09ad19b54..c3ac06e1fc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 73d3e8ddf5..354d6d853d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index 1d9657b72b..13b533a54f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.TaskZoneSettings; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java index 9f749f9a6e..5a3805fae0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index f70c352a0e..c984d97cd6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java index d898d2c397..6dcd5de9a1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 521e4ad7bb..57e75ae3e9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.InitialShortcutData; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; @@ -35,7 +36,6 @@ import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4277445f46..09bf4d44b6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -43,21 +43,21 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PetitionManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 654c95780e..9bb35cb7fa 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; -import org.l2jmobius.gameserver.model.base.ClassId; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a9ee6b70d9..a39e330d4c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -22,6 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.enums.Race; @@ -32,14 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; @@ -568,7 +568,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getDualClassLevel() > 0) { - final SubClass playerDualClass = player.getDualClass(); + final SubClassHolder playerDualClass = player.getDualClass(); if ((playerDualClass == null) || (playerDualClass.getLevel() < skillLearn.getDualClassLevel())) { return false; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 828b38864b..0d5672fb40 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 5001cf8b8e..5d0fbf40ba 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8fc855eca0..1e87455cc7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index abb645f985..ef8b2cf963 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 81dbb0d704..52863e1fd5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 8838fefa65..981996d4c2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 2834a27ebd..272e2f7fe6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 8f0bfcd431..05e09e6dfc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java index bf37f72ae5..b2f32527da 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 19d94c2585..715be58f93 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java index 4c0af8accc..84d38a443a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; import org.l2jmobius.commons.network.PacketReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 122d60272e..7f0e32b31e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 2aaa26b599..7d42393a58 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index ce9f7f44ec..f8ce2b0922 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 9b655cdc92..940cbd3169 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 283983cc6b..30e0b1b097 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -27,16 +27,16 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.Event; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 398ca12513..458046879d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index ec7007f7b9..4f70ca3668 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 107afbb395..0e7b4529e5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java index 34370c05ee..097e8f5d30 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java index ba4f579ddc..6df5163c58 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java index d8b35ee5a3..56f921bcab 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index c2fc4effe6..f6702caa41 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java index 6ee22ecbb0..8f97156f15 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index b06bbe7583..be68d42341 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 203854a8c0..3d741a86a6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index 70635ff95b..a4f7617e60 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 6b8c0d64e9..2b43c0ce4b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.CastleSide; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 16aff99201..a005fa8ad8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index dd6984a815..a40690e845 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 3200220765..993f77ec6b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 0e2325e231..7f8a08691c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index f7f1953506..1e06cc2a3f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 7bacef1cfc..82554fdc5f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 778bd1e898..7a9f6f7389 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 176e9b44d1..ee9fa9fd37 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index b17a294893..f389b26ed5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 33d1abccb9..27da99cf41 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index fe4407474e..3e3765eed2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index db4e099d22..3656ddbc4e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index 6f728b4fe4..2ae09181a7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index a9d9c157f7..04e0f46871 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -43,7 +43,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket _type = type.ordinal(); _subs = new ArrayList<>(); _subs.add(0, new SubInfo(player)); - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { _subs.add(new SubInfo(sub)); } @@ -56,7 +56,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket private final int _level; private final int _type; - public SubInfo(SubClass sub) + public SubInfo(SubClassHolder sub) { _index = sub.getClassIndex(); _classId = sub.getClassId(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 855d3d5fb0..66eccc7fbf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index cc12b05bc8..5d5c831f14 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 01dcc0ed18..5ed678042b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 9de3c0baba..d1a4c1f73b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,11 +20,11 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index 05638be656..eb0dd7a59f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java index f93fdd9c13..d95f42827a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.taskmanager.Task; import org.l2jmobius.gameserver.taskmanager.TaskManager; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java index f9e85c9134..ab7570016e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index f1d9eb0f66..2f1b8d574d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -20,10 +20,10 @@ import java.util.List; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4f1884483e..3066ed9084 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -24,13 +24,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChangeToAwakenedClass; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index c0e54a4fe0..8e2ecfdbda 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -23,12 +23,12 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index ebf3864210..371e8b6efc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -19,12 +19,12 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 204b9a5667..e3bd131843 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -31,18 +31,18 @@ import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -243,7 +243,7 @@ public class Raina extends AbstractNpcAI { final StringBuilder sb = new StringBuilder(); final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "subclassRemoveList.html"); - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass != null) { @@ -673,7 +673,7 @@ public class Raina extends AbstractNpcAI // scan for already used subclasses final int availClassId = pclass.getId(); final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { final ClassId subId = ClassId.getClassId(subList.getClassId()); if (subId.equalsOrChildOf(cid)) @@ -703,7 +703,7 @@ public class Raina extends AbstractNpcAI { final ClassId cid = ClassId.getClassId(classId); ClassId subClassId; - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { subClassId = ClassId.getClassId(subList.getClassId()); if (subClassId.equalsOrChildOf(cid)) @@ -739,7 +739,7 @@ public class Raina extends AbstractNpcAI private boolean hasAllSubclassLeveled(PlayerInstance player) { boolean leveled = true; - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { if ((sub != null) && (sub.getLevel() < 75)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index ef8b92c0ec..a89a5183bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; @@ -210,7 +210,7 @@ public class Trandon extends AbstractNpcAI takeItems(player, SUB_CERTIFICATE, -1); player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, npc); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { player.getVariables().remove(SUB_CERTIFICATE_COUNT_VAR + subclass.getClassId()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java index 0f01060430..8d0d2376bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java @@ -19,11 +19,11 @@ package ai.others.AlchemistManager; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 8edb057dd4..79f61014f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -19,8 +19,8 @@ package ai.others.CastleAmbassador; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 2d648de940..ddc6ff9e74 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -37,9 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; @@ -48,6 +45,9 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 6501fcc558..ad39458983 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java index 7ffba9221f..18abb8dafe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleSideEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleSideEffect.java index 4a5e4b04b0..b1fd925efc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleSideEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleSideEffect.java @@ -18,7 +18,7 @@ package ai.others; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ExCastleState; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 6695d44df2..00fd04bfd7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 9004090cd4..ff4c416b6b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.Bidder; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 595f8c88a0..b73a819176 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 22fbc5fbe1..822dcc2e68 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 530be1e85b..a6fdab323a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 7b497c1b38..a9ba427796 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java index 1b8c0cc50e..1ca2951ce7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java @@ -21,11 +21,11 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 86669cf7d3..33502c6fb1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.Mentee; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 51488eac53..b96b0d3460 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index bf94eb3afc..e879012594 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -30,13 +30,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.handler.BypassHandler; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index dded92c215..f469c39159 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java index 174255624f..576eadf4f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 22c7dd487b..3eeeafb2cd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 95d0581c29..e01a966fd4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -19,10 +19,10 @@ package custom.FakePlayers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.FakePlayerData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 597d7031c1..d4c850f564 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java index 33e960d44c..c61c07b685 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; public class ItemInstanceAction implements IActionHandler diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java index 1f204280f0..4b75e2bfb8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IActionHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index e51c05342a..b4d3c2a645 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StaticObject; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d61b3cd144..27c1e2cd73 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 04df6fcb37..45884c05ce 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java index 1dedada1f4..94348e020e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 1c1a282776..de7b086fb5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 83a120d8c4..e04d66f3e2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index dd70ccc79c..0d9b835f4c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -46,7 +47,6 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 462a5f4557..2d7e669ac4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.GameEvent.EventState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 77ae194287..3ccca7b46d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java index 298eecbede..014c8e7631 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 63cdf1ab2d..081bbe2c2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -19,9 +19,9 @@ package handlers.bypasshandlers; import java.util.logging.Level; import org.l2jmobius.gameserver.handler.IBypassHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; public class EventEngine implements IBypassHandler { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 569c3b0883..7f3b1c4f76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.handler.IWriteBoardHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index b174f935ff..467d6c462d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,12 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dafe04d202..894e1f3ed9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 0d1c34c7f1..eb768e547a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 3d3ca58f22..136183a12e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 5d27431c66..beb6e18018 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index e1b3e072c7..bc0212c92a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 27684a7f8a..19ed78fac4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index d7492d9b97..32107cf16c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index 449bc316f8..958e0b623d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ffcb045f63..0d3c9573e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 29c2260378..99c4ca7cc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index 512f140411..1517ea54c5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 66067f20a9..d2d4c45448 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -18,11 +18,11 @@ package handlers.skillconditionhandlers; import java.util.List; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 2c4160ec61..2531d33eae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -16,11 +16,11 @@ */ package handlers.skillconditionhandlers; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 4d99f48f53..6ece0fc678 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index ca2af837ab..35b27840c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 1ceaa4af0a..07ca155a52 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java index 7a0d9959c5..b906d68f89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java index 9d53e1a686..b5f1d8e967 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.type.SiegeZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 21e5f69860..12378128cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 3b67b71e46..4dedee6473 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; import instances.AbstractInstance; import quests.Q00512_BladeUnderFoot.Q00512_BladeUnderFoot; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 8054e0ed0d..b0ed1fc984 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -21,6 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 6af5a366aa..686b01379b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; import instances.AbstractInstance; import quests.Q00511_AwlUnderFoot.Q00511_AwlUnderFoot; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 177e234739..408e426ce5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 3640d0b5e4..b3de2f227a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 6729015a9b..123cc6b19d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -17,11 +17,11 @@ package quests.Q00061_LawEnforcement; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 486056ca28..135a98ec78 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Awl Under Foot (511) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java index b666a96d4a..4c5c32a2cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Blade Under Foot (512) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 66799f1982..5513e9ef4e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Light within the Darkness (726) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 6c44c24891..f3048633ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Hope within the Darkness (727) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index 60b5f0ced5..3ceca0b4f9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -18,11 +18,11 @@ package quests.Q10331_StartOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java index 5ba5e84c04..cd068906c1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java @@ -17,12 +17,12 @@ package quests.Q10338_SeizeYourDestiny; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 4515b12361..9f439636ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -19,12 +19,12 @@ package quests.Q10360_CertificationOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java index b5a980f1a9..8ab7bf2d5a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java @@ -16,11 +16,11 @@ */ package quests.Q10521_QueenNavarisLetterVarkaSilenosBarracks; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java index 3dd016793c..96214c36eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java @@ -16,11 +16,11 @@ */ package quests.Q10525_QueenNavarisLetterKetraOrcOutpost; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index db1ae63ac7..bf8dc2bd25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10735_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 8df3a18540..24f1550315 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10736_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 367caa41ee..1342f01911 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index eb858da992..4f210da0f4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -18,13 +18,13 @@ package quests.Q10752_WindsOfFateAPromise; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 80db8d0735..fc3f68d9a6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index ee8e29bee3..3a8a6183c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -19,11 +19,11 @@ package quests.Q10790_AMercenaryHelper; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 7a36d02b12..bdb6c1ba8c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -16,12 +16,12 @@ */ package quests.Q10791_TheManOfMystery; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index a6f9c3f47c..8adbb1ef72 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index f56a4948eb..db4b63adb8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index 21d143da8b..9d958a3a21 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java index e48c400f59..3fa3381056 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -59,9 +59,9 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/FortUpdater.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/FortUpdater.java index b984f26621..a502f222a1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/FortUpdater.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/FortUpdater.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Class managing periodical events with castle diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 2da50212da..292892d8d2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -145,8 +145,8 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java index c5aae8dd33..e58b8b6e20 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 0bff9b9059..4e4da8df06 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -45,14 +45,14 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanWar; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index 5f36b093b2..283e2f0116 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClassListData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClassListData.java index e0835c9ce8..dca159e58e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClassListData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ClassListData.java @@ -26,8 +26,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.ClassInfo; +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.holders.ClassInfoHolder; /** * Loads the the list of classes and it's info. @@ -37,7 +37,7 @@ public class ClassListData implements IXmlReader { private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName()); - private final Map _classData = new ConcurrentHashMap<>(); + private final Map _classData = new ConcurrentHashMap<>(); /** * Instantiates a new class list data. @@ -78,7 +78,7 @@ public class ClassListData implements IXmlReader className = attr.getNodeValue(); attr = attrs.getNamedItem("parentClassId"); parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null; - _classData.put(classId, new ClassInfo(classId, className, parentClassId)); + _classData.put(classId, new ClassInfoHolder(classId, className, parentClassId)); } } } @@ -89,7 +89,7 @@ public class ClassListData implements IXmlReader * Gets the class list. * @return the complete class list. */ - public Map getClassList() + public Map getClassList() { return _classData; } @@ -99,7 +99,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(ClassId classId) + public ClassInfoHolder getClass(ClassId classId) { return _classData.get(classId); } @@ -109,7 +109,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id as integer. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(int classId) + public ClassInfoHolder getClass(int classId) { final ClassId id = ClassId.getClassId(classId); return (id != null) ? _classData.get(id) : null; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java index bf8345d7cf..b98992d5bf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java @@ -28,10 +28,10 @@ import java.util.stream.Collectors; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java index ab5be1c99c..86d06999b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 76d501328b..629cf7dc77 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 342d477cb7..1915d5a056 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -29,13 +29,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MacroType; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java index 19981c3d24..63010ebdfd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; /** * Loads player's base stats. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index cdae80bb3d..9d1cc99f37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -38,15 +38,15 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java similarity index 92% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java index f98e8c4955..46f8021885 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Learning skill types. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ClassId.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassId.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ClassId.java index fdc2fffa68..b6f96a8c9c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ClassId.java @@ -14,14 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/PlayerState.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PlayerState.java similarity index 91% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/PlayerState.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PlayerState.java index cb16dd5971..fc67134f9f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/PlayerState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PlayerState.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; public enum PlayerState { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SocialClass.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/SocialClass.java similarity index 91% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SocialClass.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/SocialClass.java index 3b86db6e1e..b479370447 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SocialClass.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/SocialClass.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.enums; /** * Enumerated for Social Classes. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 6bc30f2206..2618c1b7b1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager implements InstanceListManager { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e9aac43188..3d8c1f50e4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.interfaces.IStorable; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java index 1daea8553c..781c07913c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -38,11 +38,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.CommissionManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.commission.CommissionItem; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java index 054c6f4bcc..dd530dd6d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java @@ -30,9 +30,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ba7e62a8c9..f033cf2f76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -31,13 +31,13 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; @@ -112,7 +112,7 @@ public class DailyTaskManager extends AbstractEventManager> for (PlayerInstance player : World.getInstance().getPlayers()) { player.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS, false); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { subclass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index a551a07de0..233bea17ac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 30b289b8b6..767c90e4ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.InstanceListManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; public class FortManager implements InstanceListManager { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index b5718c1ebd..cbc70a9567 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,9 +38,9 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MailManager.java index 2a82541b39..8fa771c248 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MailManager.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import org.l2jmobius.gameserver.network.serverpackets.ExUnReadMailCount; import org.l2jmobius.gameserver.taskmanager.MessageDeletionTaskManager; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 0b7b56439c..920d974e48 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java index aa5fe75760..b3d0504beb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java @@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MatchingRoomType; import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.matching.MatchingRoom; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index a926d9b04b..78cf922b7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Siege Guard Manager. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index d65e7ac73a..b06a6774aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.TowerSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; public class SiegeManager diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/GameEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/GameEvent.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java index b8c0608bd1..c0cc276691 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/GameEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.events; import java.io.BufferedReader; import java.io.FileReader; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 60e691a19c..687d1288b9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.instancemanager.games; import java.util.Map; import java.util.Map.Entry; @@ -54,9 +54,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** * @author BiggBoss */ -public class BlockCheckerEngine +public class BlockChecker { - protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BlockChecker.class.getName()); // The object which holds all basic members info protected ArenaParticipantsHolder _holder; // Maps to hold player of each team and his points @@ -127,7 +127,7 @@ public class BlockCheckerEngine // Preserve from exploit reward by logging out protected boolean _abnormalEnd = false; - public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) + public BlockChecker(ArenaParticipantsHolder holder, int arena) { _holder = holder; if ((arena > -1) && (arena < 4)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index e9b0a4dbfc..5da780a150 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,14 +34,14 @@ public class ArenaParticipantsHolder private final int _arena; private final List _redPlayers; private final List _bluePlayers; - private final BlockCheckerEngine _engine; + private final BlockChecker _engine; public ArenaParticipantsHolder(int arena) { _arena = arena; _redPlayers = new ArrayList<>(6); _bluePlayers = new ArrayList<>(6); - _engine = new BlockCheckerEngine(this, _arena); + _engine = new BlockChecker(this, _arena); } public List getRedPlayers() @@ -130,7 +130,7 @@ public class ArenaParticipantsHolder _bluePlayers.clear(); } - public BlockCheckerEngine getEvent() + public BlockChecker getEvent() { return _engine; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Couple.java similarity index 95% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Couple.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Couple.java index 54104ff7ab..dbca7d1e97 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Couple.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Couple.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 9894cb3e94..2eb9194abe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model; import java.util.List; import java.util.function.Function; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.handler.DailyMissionHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java similarity index 95% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Duel.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java index 1d117e44d8..65eddcbb0c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Duel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.util.Calendar; import java.util.List; @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.enums.Team; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Message.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Message.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java index 97d24eb1c8..e6b1c31d32 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Message.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java index 2a32e32d54..5eb90fb4ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.base.SocialClass; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 8e563987ca..a52a2c2e21 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -56,7 +56,6 @@ import org.l2jmobius.gameserver.model.actor.status.AttackableStatus; import org.l2jmobius.gameserver.model.actor.tasks.attackable.CommandChannelTimer; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAggroRangeEnter; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttack; @@ -66,6 +65,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3ebe6eb63a..62f1d1049f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -61,9 +61,6 @@ import org.l2jmobius.gameserver.model.actor.instance.WarehouseInstance; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcCanBeSeen; @@ -80,6 +77,9 @@ import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java index 4698bfdcf8..7eacda4aa1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; @@ -51,7 +51,7 @@ public class BlockInstance extends MonsterInstance // Do not update color while sending old info synchronized (this) { - final BlockCheckerEngine event = holder.getEvent(); + final BlockChecker event = holder.getEvent(); if (_colorEffect == 0x53) { // Change color @@ -137,7 +137,7 @@ public class BlockInstance extends MonsterInstance } } - private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockCheckerEngine eng) + private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockChecker eng) { eng.increasePlayerPoints(player, team); @@ -149,7 +149,7 @@ public class BlockInstance extends MonsterInstance eng.getHolder().broadCastPacketToTeam(secretPoints); } - private void dropItem(int id, BlockCheckerEngine eng, PlayerInstance player) + private void dropItem(int id, BlockChecker eng, PlayerInstance player) { final ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); final int x = getX() + Rnd.get(50); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java index b882c183a6..0b025e1f03 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index 975d847005..d5d0a599f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 21141aa0a5..3602d314ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index a9e7ce65a2..8c3be792ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 588e4d6da9..3d16b348a2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.FolkStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 097cd5ab6c..b163ef623e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -83,6 +83,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ClanWarState; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.HtmlActionScope; @@ -124,11 +125,13 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.SellBuffsManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.ContactList; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; @@ -176,8 +179,6 @@ import org.l2jmobius.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask; import org.l2jmobius.gameserver.model.actor.tasks.player.WaterTask; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -186,12 +187,6 @@ import org.l2jmobius.gameserver.model.clan.ClanWar; import org.l2jmobius.gameserver.model.cubic.CubicInstance; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Duel; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Hero; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; @@ -226,6 +221,7 @@ import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; @@ -248,6 +244,7 @@ import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -257,6 +254,9 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -451,7 +451,7 @@ public class PlayerInstance extends Playable private boolean _petItems = false; /** The list of sub-classes this character has. */ - private final Map _subClasses = new ConcurrentHashMap<>(); + private final Map _subClasses = new ConcurrentHashMap<>(); private static final String ORIGINAL_CLASS_VAR = "OriginalClass"; @@ -6610,7 +6610,7 @@ public class PlayerInstance extends Playable // Restore Subclass Data (cannot be done earlier in function) if (restoreSubClassData(player) && (activeClassId != player.getBaseClass())) { - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass.getClassId() == activeClassId) { @@ -6830,7 +6830,7 @@ public class PlayerInstance extends Playable { while (rset.next()) { - final SubClass subClass = new SubClass(); + final SubClassHolder subClass = new SubClassHolder(); subClass.setClassId(rset.getInt("class_id")); subClass.setDualClassActive(rset.getBoolean("dual_class")); subClass.setVitalityPoints(rset.getInt("vitality_points")); @@ -7144,7 +7144,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(UPDATE_CHAR_SUBCLASS)) { - for (SubClass subClass : getSubClasses().values()) + for (SubClassHolder subClass : getSubClasses().values()) { statement.setLong(1, subClass.getExp()); statement.setLong(2, subClass.getSp()); @@ -9531,7 +9531,7 @@ public class PlayerInstance extends Playable // Note: Never change _classIndex in any method other than setActiveClass(). - final SubClass newClass = new SubClass(); + final SubClassHolder newClass = new SubClassHolder(); newClass.setClassId(classId); newClass.setClassIndex(classIndex); newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); @@ -9622,7 +9622,7 @@ public class PlayerInstance extends Playable EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); } - final SubClass subClass = getSubClasses().get(classIndex); + final SubClassHolder subClass = getSubClasses().get(classIndex); if (subClass == null) { return false; @@ -9721,7 +9721,7 @@ public class PlayerInstance extends Playable { return false; } - final SubClass subClass = _subClasses.get(_classIndex); + final SubClassHolder subClass = _subClasses.get(_classIndex); if (subClass == null) { return false; @@ -9731,7 +9731,7 @@ public class PlayerInstance extends Playable public boolean hasDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9741,9 +9741,9 @@ public class PlayerInstance extends Playable return false; } - public SubClass getDualClass() + public SubClassHolder getDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9753,7 +9753,7 @@ public class PlayerInstance extends Playable return null; } - public Map getSubClasses() + public Map getSubClasses() { return _subClasses; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 217fb1c4b0..0607b51090 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.SiegeFlagStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index edad148a46..7d586645f8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -24,6 +24,7 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -32,12 +33,11 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java index 59f438128f..fd5f1052e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; public class NpcStatus extends CreatureStatus { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index 0976283d6d..e3b931cdd3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.DuelManager; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 6c305ffe1b..341ed13771 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 782dca3687..f2acbb5d8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -22,9 +22,9 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index f27bfd1912..df4177e12b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 3466416f97..8fc4eaaad2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index cba6999dc2..17a8de9fd3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 6b4fb92953..cee0537b63 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 7f5b51a8f9..07282525cd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 81a9539d78..c5cad7593a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index c020f982f3..6a9ce6b0e4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.conditions; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2e67022ea7..3233eacd28 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index a767df0bc1..8f195b1ba9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -52,6 +52,7 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PcCafePointsManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; @@ -65,9 +66,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.Ids; import org.l2jmobius.gameserver.model.events.annotations.NpcLevelRange; @@ -146,6 +144,8 @@ import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.SpawnGroup; import org.l2jmobius.gameserver.model.spawns.SpawnTemplate; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java index 655a3fb505..0c73b7dfa2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerSkillLearn.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.creature.player; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java index 0ca3450101..880ee008a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java index 9f1e438d15..7f93a263ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeOwnerChange.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java index 0e13607419..47c5ea3720 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnCastleSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.Siege; /** * @author UnAfraid diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java index 9e81e6f036..1e9ef8a3e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeFinish.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java index c0d9c21d7d..a9d480bbc0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/sieges/OnFortSiegeStart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.events.impl.sieges; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.siege.FortSiege; /** * @author UnAfraid diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java similarity index 88% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassInfo.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java index f4cfcb60c5..cb1c49612e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/ClassInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClassInfoHolder.java @@ -14,15 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import java.util.regex.Matcher; +import org.l2jmobius.gameserver.enums.ClassId; + /** * This class will hold the information of the player classes. * @author Zoey76 */ -public class ClassInfo +public class ClassInfoHolder { private final ClassId _classId; private final String _className; @@ -34,7 +36,7 @@ public class ClassInfo * @param className the in game class name. * @param parentClassId the parent class for the given {@code classId}. */ - public ClassInfo(ClassId classId, String className, ClassId parentClassId) + public ClassInfoHolder(ClassId classId, String className, ClassId parentClassId) { _classId = classId; _className = className; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java similarity index 91% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java index 7c18ab192e..91b3f75228 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SubClassHolder.java @@ -14,17 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.base; +package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; /** * Character Sub-Class Definition
* Used to store key information about a character's sub-class. * @author Tempy */ -public class SubClass +public class SubClassHolder { private static final byte MAX_LEVEL = Config.MAX_SUBCLASS_LEVEL < ExperienceData.getInstance().getMaxLevel() ? Config.MAX_SUBCLASS_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1); @@ -39,7 +40,7 @@ public class SubClass private int _vitalityPoints = 0; private boolean _dualClass = false; - public SubClass() + public SubClassHolder() { // Used for specifying ALL attributes of a sub class directly, // using the preset default values. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java index 56dd78243c..426a12682a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java @@ -21,8 +21,8 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 018f1ad599..87d48c4dfd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -62,7 +62,6 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; @@ -80,6 +79,7 @@ import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java similarity index 96% rename from L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5d13146ab0..bed9045612 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.olympiad; import java.sql.Connection; import java.sql.PreparedStatement; @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.Olympiad; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 0e9937b25a..cf9e694197 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -47,7 +47,6 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java index 61703e4f2c..ef016993ae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -40,7 +40,9 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.enums.Race; @@ -55,8 +57,6 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.TrapInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index 50b91578e3..cf665da8f8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -30,9 +30,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.interfaces.INamable; import org.l2jmobius.gameserver.model.zone.type.ResidenceZone; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/Bidder.java similarity index 92% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/Bidder.java index 24b8576a12..f4d30762c2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clanhallauction/Bidder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/Bidder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.time.Instant; import java.time.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java new file mode 100644 index 0000000000..a292c439e5 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -0,0 +1,397 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.residences; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.commons.concurrent.ThreadPool; +import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.data.sql.ClanTable; +import org.l2jmobius.gameserver.enums.ClanHallGrade; +import org.l2jmobius.gameserver.enums.ClanHallType; +import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.model.Location; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; +import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; + +/** + * @author St3eT + */ +public class ClanHall extends AbstractResidence +{ + private static final Logger LOGGER = Logger.getLogger(ClanHall.class.getName()); + + // Static parameters + private final ClanHallGrade _grade; + private final ClanHallType _type; + private final int _minBid; + final int _lease; + private final int _deposit; + private final List _npcs; + private final List _doors; + private final List _teleports; + private final Location _ownerLocation; + private final Location _banishLocation; + // Dynamic parameters + Clan _owner = null; + long _paidUntil = 0; + protected ScheduledFuture _checkPaymentTask = null; + // Other + private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; + private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; + private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; + + public ClanHall(StatSet params) + { + super(params.getInt("id")); + // Set static parameters + setName(params.getString("name")); + _grade = params.getEnum("grade", ClanHallGrade.class); + _type = params.getEnum("type", ClanHallType.class); + _minBid = params.getInt("minBid"); + _lease = params.getInt("lease"); + _deposit = params.getInt("deposit"); + _npcs = params.getList("npcList", Integer.class); + _doors = params.getList("doorList", DoorInstance.class); + _teleports = params.getList("teleportList", ClanHallTeleportHolder.class); + _ownerLocation = params.getLocation("owner_loc"); + _banishLocation = params.getLocation("banish_loc"); + // Set dynamic parameters (from DB) + load(); + // Init Clan Hall zone and Functions + initResidenceZone(); + initFunctions(); + } + + @Override + protected void load() + { + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement loadStatement = con.prepareStatement(LOAD_CLANHALL); + PreparedStatement insertStatement = con.prepareStatement(INSERT_CLANHALL)) + { + loadStatement.setInt(1, getResidenceId()); + + try (ResultSet rset = loadStatement.executeQuery()) + { + if (rset.next()) + { + setPaidUntil(rset.getLong("paidUntil")); + setOwner(rset.getInt("ownerId")); + } + else + { + insertStatement.setInt(1, getResidenceId()); + insertStatement.setInt(2, 0); // New clanhall should not have owner + insertStatement.setInt(3, 0); // New clanhall should not have paid until + if (insertStatement.execute()) + { + LOGGER.info("Clan Hall " + getName() + " (" + getResidenceId() + ") was sucessfully created."); + } + } + } + } + catch (SQLException e) + { + LOGGER.log(Level.INFO, "Failed loading clan hall", e); + } + } + + public void updateDB() + { + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) + { + statement.setInt(1, getOwnerId()); + statement.setLong(2, _paidUntil); + statement.setInt(3, getResidenceId()); + statement.execute(); + } + catch (SQLException e) + { + LOGGER.warning(e.toString()); + } + } + + @Override + protected void initResidenceZone() + { + for (ClanHallZone zone : ZoneManager.getInstance().getAllZones(ClanHallZone.class)) + { + if (zone.getResidenceId() == getResidenceId()) + { + setResidenceZone(zone); + break; + } + } + } + + public int getCostFailDay() + { + final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); + return failDay.isNegative() ? 0 : (int) failDay.toDays(); + } + + /** + * Teleport all non-owner players from {@link ClanHallZone} to {@link ClanHall#getBanishLocation()}. + */ + public void banishOthers() + { + getResidenceZone().banishForeigners(getOwnerId()); + } + + /** + * Open or close all {@link DoorInstance} related to this {@link ClanHall}. + * @param open {@code true} means open door, {@code false} means close door + */ + public void openCloseDoors(boolean open) + { + _doors.forEach(door -> door.openCloseMe(open)); + } + + /** + * Gets the grade of clan hall. + * @return grade of this {@link ClanHall} in {@link ClanHallGrade} enum. + */ + public ClanHallGrade getGrade() + { + return _grade; + } + + /** + * Gets all {@link DoorInstance} related to this {@link ClanHall}. + * @return all {@link DoorInstance} related to this {@link ClanHall} + */ + public List getDoors() + { + return _doors; + } + + /** + * Gets all {@link Npc} related to this {@link ClanHall}. + * @return all {@link Npc} related to this {@link ClanHall} + */ + public List getNpcs() + { + return _npcs; + } + + /** + * Gets the {@link ClanHallType} of this {@link ClanHall}. + * @return {@link ClanHallType} of this {@link ClanHall} in {@link ClanHallGrade} enum. + */ + public ClanHallType getType() + { + return _type; + } + + /** + * Gets the {@link Clan} which own this {@link ClanHall}. + * @return {@link Clan} which own this {@link ClanHall} + */ + public Clan getOwner() + { + return _owner; + } + + /** + * Gets the {@link Clan} ID which own this {@link ClanHall}. + * @return the {@link Clan} ID which own this {@link ClanHall} + */ + @Override + public int getOwnerId() + { + final Clan owner = _owner; + return (owner != null) ? owner.getId() : 0; + } + + /** + * Set the owner of clan hall + * @param clanId the Id of the clan + */ + public void setOwner(int clanId) + { + setOwner(ClanTable.getInstance().getClan(clanId)); + } + + /** + * Set the clan as owner of clan hall + * @param clan the Clan object + */ + public void setOwner(Clan clan) + { + if (clan != null) + { + _owner = clan; + clan.setHideoutId(getResidenceId()); + clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); + if (_paidUntil == 0) + { + setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); + } + + final int failDays = getCostFailDay(); + final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); + } + else + { + if (_owner != null) + { + _owner.setHideoutId(0); + _owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_owner)); + removeFunctions(); + } + _owner = null; + setPaidUntil(0); + if (_checkPaymentTask != null) + { + _checkPaymentTask.cancel(true); + _checkPaymentTask = null; + } + } + updateDB(); + } + + /** + * Gets the due date of clan hall payment + * @return the due date of clan hall payment + */ + public long getPaidUntil() + { + return _paidUntil; + } + + /** + * Set the due date of clan hall payment + * @param paidUntil the due date of clan hall payment + */ + public void setPaidUntil(long paidUntil) + { + _paidUntil = paidUntil; + } + + /** + * Gets the next date of clan hall payment + * @return the next date of clan hall payment + */ + public long getNextPayment() + { + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + } + + public Location getOwnerLocation() + { + return _ownerLocation; + } + + public Location getBanishLocation() + { + return _banishLocation; + } + + public List getTeleportList() + { + return _teleports; + } + + public List getTeleportList(int functionLevel) + { + final List result = new ArrayList<>(); + for (ClanHallTeleportHolder holder : _teleports) + { + if (holder.getMinFunctionLevel() <= functionLevel) + { + result.add(holder); + } + } + return result; + } + + public int getMinBid() + { + return _minBid; + } + + public int getLease() + { + return _lease; + } + + public int getDeposit() + { + return _deposit; + } + + class CheckPaymentTask implements Runnable + { + @Override + public void run() + { + if (_owner != null) + { + if (_owner.getWarehouse().getAdena() < _lease) + { + if (getCostFailDay() > 8) + { + _owner.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); + setOwner(null); + } + else + { + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day + final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); + sm.addInt(_lease); + _owner.broadcastToOnlineMembers(sm); + } + } + else + { + _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); + setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); + updateDB(); + } + } + } + } + + @Override + public String toString() + { + return (getClass().getSimpleName() + ":" + getName() + "[" + getResidenceId() + "]"); + } +} \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java similarity index 94% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 746832fd57..2fa683814d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clanhallauction/ClanHallAuction.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.clanhallauction; +package org.l2jmobius.gameserver.model.residences; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java similarity index 95% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java index 3bf01c04ea..8aa51ae1d1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java similarity index 96% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Fort.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java index 4b535778a2..e55f1b4a2f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Fort.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/FortSiege.java similarity index 96% rename from L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/FortSiege.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index e1c798b801..4788e0f6fe 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siegable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siegable.java similarity index 93% rename from L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siegable.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siegable.java index a450298acc..6976ee8a47 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Siegable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siegable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.util.Calendar; import java.util.Collection; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java similarity index 96% rename from L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java rename to L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java index fda6e52be6..25e8b587a3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Siege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model.siege; import java.sql.Connection; import java.sql.PreparedStatement; @@ -60,6 +60,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeFinish; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeOwnerChange; import org.l2jmobius.gameserver.model.events.impl.sieges.OnCastleSiegeStart; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 3637bfe805..c7b80987c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -28,14 +28,14 @@ import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java index d09ad19b54..c3ac06e1fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenMPFinalizer.java @@ -26,13 +26,13 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.residences.AbstractResidence; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 73d3e8ddf5..354d6d853d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.zone.ZoneId; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java index 1d9657b72b..13b533a54f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/DamageZone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.TaskZoneSettings; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java index 9f749f9a6e..5a3805fae0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SiegeZone.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java index f70c352a0e..c984d97cd6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java index d898d2c397..6dcd5de9a1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/TaxZone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 521e4ad7bb..57e75ae3e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.InitialShortcutData; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; @@ -35,7 +36,6 @@ import org.l2jmobius.gameserver.model.actor.appearance.PlayerAppearance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9fa4b18a23..bffb800bda 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -43,21 +43,21 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.PetitionManager; import org.l2jmobius.gameserver.instancemanager.ServerRestartManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 654c95780e..9bb35cb7fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; -import org.l2jmobius.gameserver.model.base.ClassId; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a9ee6b70d9..a39e330d4c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -22,6 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.enums.Race; @@ -32,14 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FishermanInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.VillageMasterInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; @@ -568,7 +568,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getDualClassLevel() > 0) { - final SubClass playerDualClass = player.getDualClass(); + final SubClassHolder playerDualClass = player.getDualClass(); if ((playerDualClass == null) || (playerDualClass.getLevel() < skillLearn.getDualClassLevel())) { return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 828b38864b..0d5672fb40 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 5001cf8b8e..5d0fbf40ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8fc855eca0..1e87455cc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -32,13 +32,13 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index abb645f985..ef8b2cf963 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 81dbb0d704..52863e1fd5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 8838fefa65..981996d4c2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 2834a27ebd..272e2f7fe6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 8f0bfcd431..05e09e6dfc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java index bf37f72ae5..b2f32527da 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 19d94c2585..715be58f93 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java index 4c0af8accc..84d38a443a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java @@ -20,8 +20,8 @@ import java.util.LinkedList; import java.util.List; import org.l2jmobius.commons.network.PacketReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 122d60272e..7f0e32b31e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 2aaa26b599..7d42393a58 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index ce9f7f44ec..f8ce2b0922 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 9b655cdc92..940cbd3169 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 283983cc6b..30e0b1b097 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -27,16 +27,16 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.Event; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 398ca12513..458046879d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index ec7007f7b9..4f70ca3668 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 107afbb395..0e7b4529e5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java index 34370c05ee..097e8f5d30 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java index ba4f579ddc..6df5163c58 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java index d8b35ee5a3..56f921bcab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index c2fc4effe6..f6702caa41 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java index 6ee22ecbb0..8f97156f15 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index e3283cfbb9..52191c1fed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 203854a8c0..3d741a86a6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index 70635ff95b..a4f7617e60 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 6b8c0d64e9..2b43c0ce4b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.CastleSide; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 16aff99201..a005fa8ad8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -20,7 +20,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index dd6984a815..a40690e845 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 3200220765..993f77ec6b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 0e2325e231..7f8a08691c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index f7f1953506..1e06cc2a3f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 7bacef1cfc..82554fdc5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 858d6e9a08..b0f3738683 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 176e9b44d1..ee9fa9fd37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index b17a294893..f389b26ed5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -22,7 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 33d1abccb9..27da99cf41 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.model.FortSiegeSpawn; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index fe4407474e..3e3765eed2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index db4e099d22..3656ddbc4e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index 6f728b4fe4..2ae09181a7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index a9d9c157f7..04e0f46871 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -43,7 +43,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket _type = type.ordinal(); _subs = new ArrayList<>(); _subs.add(0, new SubInfo(player)); - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { _subs.add(new SubInfo(sub)); } @@ -56,7 +56,7 @@ public class ExSubjobInfo implements IClientOutgoingPacket private final int _level; private final int _type; - public SubInfo(SubClass sub) + public SubInfo(SubClassHolder sub) { _index = sub.getClassIndex(); _classId = sub.getClassId(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 855d3d5fb0..66eccc7fbf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index cc12b05bc8..5d5c831f14 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 01dcc0ed18..5ed678042b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 3ee0345054..005ad8496d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,12 +20,12 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index 05638be656..eb0dd7a59f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java index f93fdd9c13..d95f42827a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/tasks/TaskBirthday.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.taskmanager.Task; import org.l2jmobius.gameserver.taskmanager.TaskManager; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java index f9e85c9134..ab7570016e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.InstanceType; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionCategoryType; import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index f1d9eb0f66..2f1b8d574d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -20,10 +20,10 @@ import java.util.List; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4f1884483e..3066ed9084 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -24,13 +24,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChangeToAwakenedClass; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index c0e54a4fe0..8e2ecfdbda 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -23,12 +23,12 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java index ebf3864210..371e8b6efc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/MonkOfChaos/MonkOfChaos.java @@ -19,12 +19,12 @@ package ai.areas.TalkingIsland.MonkOfChaos; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index 204b9a5667..e3bd131843 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -31,18 +31,18 @@ import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -243,7 +243,7 @@ public class Raina extends AbstractNpcAI { final StringBuilder sb = new StringBuilder(); final NpcHtmlMessage html = getNpcHtmlMessage(player, npc, "subclassRemoveList.html"); - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass != null) { @@ -673,7 +673,7 @@ public class Raina extends AbstractNpcAI // scan for already used subclasses final int availClassId = pclass.getId(); final ClassId cid = ClassId.getClassId(availClassId); - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { final ClassId subId = ClassId.getClassId(subList.getClassId()); if (subId.equalsOrChildOf(cid)) @@ -703,7 +703,7 @@ public class Raina extends AbstractNpcAI { final ClassId cid = ClassId.getClassId(classId); ClassId subClassId; - for (SubClass subList : player.getSubClasses().values()) + for (SubClassHolder subList : player.getSubClasses().values()) { subClassId = ClassId.getClassId(subList.getClassId()); if (subClassId.equalsOrChildOf(cid)) @@ -739,7 +739,7 @@ public class Raina extends AbstractNpcAI private boolean hasAllSubclassLeveled(PlayerInstance player) { boolean leveled = true; - for (SubClass sub : player.getSubClasses().values()) + for (SubClassHolder sub : player.getSubClasses().values()) { if ((sub != null) && (sub.getLevel() < 75)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index ef8b92c0ec..a89a5183bf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSubChange; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; @@ -210,7 +210,7 @@ public class Trandon extends AbstractNpcAI takeItems(player, SUB_CERTIFICATE, -1); player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, npc); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { player.getVariables().remove(SUB_CERTIFICATE_COUNT_VAR + subclass.getClassId()); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java index 6f6d0ce51a..01f96a7e80 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AlchemistManager/AlchemistManager.java @@ -19,11 +19,11 @@ package ai.others.AlchemistManager; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.ExTutorialShowId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java index 8edb057dd4..79f61014f1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java @@ -19,8 +19,8 @@ package ai.others.CastleAmbassador; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 2d648de940..ddc6ff9e74 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -37,9 +37,6 @@ import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Castle.CastleFunction; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; @@ -48,6 +45,9 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java index 6501fcc558..ad39458983 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleDoorManager/CastleDoorManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java index 7ffba9221f..18abb8dafe 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleSideEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleSideEffect.java index 4a5e4b04b0..b1fd925efc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleSideEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleSideEffect.java @@ -18,7 +18,7 @@ package ai.others; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ExCastleState; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 6695d44df2..00fd04bfd7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.NpcSay; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 60e08f4a15..7278c7327f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -32,15 +32,15 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.clanhallauction.Bidder; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.residences.Bidder; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BypassParser; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java index 595f8c88a0..b73a819176 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallDoorManager/ClanHallDoorManager.java @@ -21,7 +21,7 @@ import java.util.StringTokenizer; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 78f0c6ce90..ba098ab917 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate; import org.l2jmobius.gameserver.model.residences.ResidenceFunctionType; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 530be1e85b..a6fdab323a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java index 7b497c1b38..a9ba427796 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java index 1b8c0cc50e..1ca2951ce7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java @@ -21,11 +21,11 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index d8be632476..6846b316bc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.Mentee; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 51488eac53..b96b0d3460 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index bf94eb3afc..e879012594 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -30,13 +30,13 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.handler.BypassHandler; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index dded92c215..f469c39159 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java index 174255624f..576eadf4f2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 22c7dd487b..3eeeafb2cd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 706471fc7a..cafaec02ed 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -19,10 +19,10 @@ package custom.FakePlayers; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.FakePlayerData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java index 597d7031c1..d4c850f564 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/DoorInstanceAction.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.DoorRequestHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; public class DoorInstanceAction implements IActionHandler diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java index 33e960d44c..c61c07b685 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/ItemInstanceAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; public class ItemInstanceAction implements IActionHandler diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java index 1f204280f0..4b75e2bfb8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionhandlers/NpcAction.java @@ -22,11 +22,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.handler.IActionHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java index e51c05342a..b4d3c2a645 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/DoorInstanceActionShift.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.StaticObject; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d61b3cd144..27c1e2cd73 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.quest.Quest; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 04df6fcb37..45884c05ce 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java index 1dedada1f4..94348e020e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCastle.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java index 1c1a282776..de7b086fb5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminClanHall.java @@ -28,12 +28,12 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.html.formatters.BypassParserFormatter; import org.l2jmobius.gameserver.model.html.pagehandlers.NextPrevPageHandler; import org.l2jmobius.gameserver.model.html.styles.ButtonsStyle; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.residences.ResidenceFunction; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 83a120d8c4..e04d66f3e2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c5057bba81..854c8d1c45 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -46,7 +47,6 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.html.PageBuilder; import org.l2jmobius.gameserver.model.html.PageResult; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 462a5f4557..2d7e669ac4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -30,10 +30,10 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent.EventState; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.GameEvent.EventState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java index 77ae194287..3ccca7b46d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java index 298eecbede..014c8e7631 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminManor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java index 63cdf1ab2d..081bbe2c2b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java @@ -19,9 +19,9 @@ package handlers.bypasshandlers; import java.util.logging.Level; import org.l2jmobius.gameserver.handler.IBypassHandler; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.GameEvent; public class EventEngine implements IBypassHandler { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 569c3b0883..7f3b1c4f76 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.handler.IWriteBoardHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index b174f935ff..467d6c462d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,12 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index dafe04d202..894e1f3ed9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.Location; @@ -31,7 +32,6 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 0d1c34c7f1..eb768e547a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 3d3ca58f22..136183a12e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 5d27431c66..beb6e18018 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index e1b3e072c7..bc0212c92a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 27684a7f8a..19ed78fac4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index d7492d9b97..32107cf16c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index 449bc316f8..958e0b623d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -18,11 +18,11 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ffcb045f63..0d3c9573e8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.instance.ChestInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java index 29c2260378..99c4ca7cc7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/BuildCampSkillCondition.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java index 512f140411..1517ea54c5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanSummonSiegeGolemSkillCondition.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java index 66067f20a9..d2d4c45448 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java @@ -18,11 +18,11 @@ package handlers.skillconditionhandlers; import java.util.List; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java index 2c4160ec61..2531d33eae 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassSkillCondition.java @@ -16,11 +16,11 @@ */ package handlers.skillconditionhandlers; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java index 4d99f48f53..6ece0fc678 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckFlagSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java index ca2af837ab..35b27840c0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckResidenceSkillCondition.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; +import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java index 1ceaa4af0a..07ca155a52 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/PossessHolythingSkillCondition.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java index 7a0d9959c5..b906d68f89 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/SendMail.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; -import org.l2jmobius.gameserver.model.entity.Message; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java index 9d53e1a686..b5f1d8e967 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.type.SiegeZone; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 21e5f69860..12378128cf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 3b67b71e46..4dedee6473 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; import instances.AbstractInstance; import quests.Q00512_BladeUnderFoot.Q00512_BladeUnderFoot; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index 8054e0ed0d..b0ed1fc984 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -21,6 +21,7 @@ import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -28,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 6af5a366aa..686b01379b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -29,10 +29,10 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; import instances.AbstractInstance; import quests.Q00511_AwlUnderFoot.Q00511_AwlUnderFoot; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java index 177e234739..408e426ce5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; @@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 3640d0b5e4..b3de2f227a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java index 6729015a9b..123cc6b19d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java @@ -17,11 +17,11 @@ package quests.Q00061_LawEnforcement; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 486056ca28..135a98ec78 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Awl Under Foot (511) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java index b666a96d4a..4c5c32a2cf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Blade Under Foot (512) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 66799f1982..5513e9ef4e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Light within the Darkness (726) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 6c44c24891..f3048633ee 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Hope within the Darkness (727) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index 60b5f0ced5..3ceca0b4f9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -18,11 +18,11 @@ package quests.Q10331_StartOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java index 5ba5e84c04..cd068906c1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java @@ -17,12 +17,12 @@ package quests.Q10338_SeizeYourDestiny; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 4515b12361..9f439636ea 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -19,12 +19,12 @@ package quests.Q10360_CertificationOfFate; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java index 4c9fd40ed1..08f90be017 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java @@ -16,11 +16,11 @@ */ package quests.Q10521_QueenNavarisLetterVarkaSilenosBarracks; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java index dc5d32e5ac..7778156b7e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10525_QueenNavarisLetterKetraOrcOutpost/Q10525_QueenNavarisLetterKetraOrcOutpost.java @@ -16,11 +16,11 @@ */ package quests.Q10525_QueenNavarisLetterKetraOrcOutpost; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java index 6ab5cd7ab8..7d38af3a2e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10560_WayOfWanderingKnight/Q10560_WayOfWanderingKnight.java @@ -18,11 +18,11 @@ package quests.Q10560_WayOfWanderingKnight; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index db1ae63ac7..bf8dc2bd25 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10735_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 8df3a18540..24f1550315 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -19,10 +19,10 @@ package quests.Q10736_ASpecialPower; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 367caa41ee..1342f01911 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -29,7 +30,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index eb858da992..4f210da0f4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -18,13 +18,13 @@ package quests.Q10752_WindsOfFateAPromise; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 80db8d0735..fc3f68d9a6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -21,6 +21,7 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; @@ -30,7 +31,6 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.Id; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index ee8e29bee3..3a8a6183c0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -19,11 +19,11 @@ package quests.Q10790_AMercenaryHelper; import java.util.HashSet; import java.util.Set; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 7a36d02b12..bdb6c1ba8c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -16,12 +16,12 @@ */ package quests.Q10791_TheManOfMystery; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index a6f9c3f47c..8adbb1ef72 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -23,10 +23,10 @@ import java.util.Map.Entry; import org.l2jmobius.Config; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index f56a4948eb..db4b63adb8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index 21d143da8b..9d958a3a21 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.MultisellData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java index cc04253d88..1068f4d402 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java @@ -59,9 +59,9 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.enums.ChatType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/FortUpdater.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/FortUpdater.java index b984f26621..a502f222a1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/FortUpdater.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/FortUpdater.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; +import org.l2jmobius.gameserver.model.siege.Fort; /** * Class managing periodical events with castle diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index 4ae8e28d21..6c09849fdf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -146,8 +146,8 @@ import org.l2jmobius.gameserver.instancemanager.WalkingManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java index d38fcfafcc..9209a15157 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Hero; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.ClientNetworkManager; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 0bff9b9059..4e4da8df06 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -45,14 +45,14 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.clan.ClanWar; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.clan.OnClanWarFinish; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanDestroy; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java index 5f36b093b2..283e2f0116 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanHallData.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.ClanHall; import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; +import org.l2jmobius.gameserver.model.residences.ClanHall; /** * @author St3eT diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClassListData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClassListData.java index e0835c9ce8..dca159e58e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClassListData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClassListData.java @@ -26,8 +26,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.ClassInfo; +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.holders.ClassInfoHolder; /** * Loads the the list of classes and it's info. @@ -37,7 +37,7 @@ public class ClassListData implements IXmlReader { private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName()); - private final Map _classData = new ConcurrentHashMap<>(); + private final Map _classData = new ConcurrentHashMap<>(); /** * Instantiates a new class list data. @@ -78,7 +78,7 @@ public class ClassListData implements IXmlReader className = attr.getNodeValue(); attr = attrs.getNamedItem("parentClassId"); parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null; - _classData.put(classId, new ClassInfo(classId, className, parentClassId)); + _classData.put(classId, new ClassInfoHolder(classId, className, parentClassId)); } } } @@ -89,7 +89,7 @@ public class ClassListData implements IXmlReader * Gets the class list. * @return the complete class list. */ - public Map getClassList() + public Map getClassList() { return _classData; } @@ -99,7 +99,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(ClassId classId) + public ClassInfoHolder getClass(ClassId classId) { return _classData.get(classId); } @@ -109,7 +109,7 @@ public class ClassListData implements IXmlReader * @param classId the class Id as integer. * @return the class info related to the given {@code classId}. */ - public ClassInfo getClass(int classId) + public ClassInfoHolder getClass(int classId) { final ClassId id = ClassId.getClassId(classId); return (id != null) ? _classData.get(id) : null; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java index bf8345d7cf..b98992d5bf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java @@ -28,10 +28,10 @@ import java.util.stream.Collectors; import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java index ab5be1c99c..86d06999b3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.Henna; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 76d501328b..629cf7dc77 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 342d477cb7..1915d5a056 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -29,13 +29,13 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MacroType; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java index 19981c3d24..63010ebdfd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PlayerTemplateData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; -import org.l2jmobius.gameserver.model.base.ClassId; /** * Loads player's base stats. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index cdae80bb3d..9d1cc99f37 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -38,15 +38,15 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.enums.SubclassType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SocialClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java new file mode 100644 index 0000000000..46f8021885 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/AcquireSkillType.java @@ -0,0 +1,64 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.enums; + +/** + * Learning skill types. + * @author Zoey76 + */ +public enum AcquireSkillType +{ + CLASS(0), + DUMMY(1), + PLEDGE(2), + SUBPLEDGE(3), + TRANSFORM(4), + TRANSFER(5), + SUBCLASS(6), + COLLECT(7), + DUMMY2(8), + DUMMY3(9), + FISHING(10), + REVELATION(11), // Need proper ID + REVELATION_DUALCLASS(12), // Need proper ID + DUALCLASS(13), // Need proper ID + ALCHEMY(140); + + private final int _id; + + private AcquireSkillType(int id) + { + _id = id; + } + + public int getId() + { + return _id; + } + + public static AcquireSkillType getAcquireSkillType(int id) + { + for (AcquireSkillType type : values()) + { + if (type.getId() == id) + { + return type; + } + } + return null; + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/ClassId.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/ClassId.java new file mode 100644 index 0000000000..b6f96a8c9c --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/ClassId.java @@ -0,0 +1,393 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.enums; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; + +/** + * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.
+ * Data: + *
    + *
  • id : The Identifier of the class
    • + *
  • isMage : True if the class is a mage class
    • + *
  • race : The race of this class
    • + *
  • parent : The parent ClassId or null if this class is the root
    • + *
+ * @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:33 $ + */ +public enum ClassId implements IIdentifiable +{ + FIGHTER(0, false, Race.HUMAN, null), + + WARRIOR(1, false, Race.HUMAN, FIGHTER), + GLADIATOR(2, false, Race.HUMAN, WARRIOR), + WARLORD(3, false, Race.HUMAN, WARRIOR), + KNIGHT(4, false, Race.HUMAN, FIGHTER), + PALADIN(5, false, Race.HUMAN, KNIGHT), + DARK_AVENGER(6, false, Race.HUMAN, KNIGHT), + ROGUE(7, false, Race.HUMAN, FIGHTER), + TREASURE_HUNTER(8, false, Race.HUMAN, ROGUE), + HAWKEYE(9, false, Race.HUMAN, ROGUE), + + MAGE(10, true, Race.HUMAN, null), + WIZARD(11, true, Race.HUMAN, MAGE), + SORCERER(12, true, Race.HUMAN, WIZARD), + NECROMANCER(13, true, Race.HUMAN, WIZARD), + WARLOCK(14, true, true, Race.HUMAN, WIZARD), + CLERIC(15, true, Race.HUMAN, MAGE), + BISHOP(16, true, Race.HUMAN, CLERIC), + PROPHET(17, true, Race.HUMAN, CLERIC), + + ELVEN_FIGHTER(18, false, Race.ELF, null), + ELVEN_KNIGHT(19, false, Race.ELF, ELVEN_FIGHTER), + TEMPLE_KNIGHT(20, false, Race.ELF, ELVEN_KNIGHT), + SWORDSINGER(21, false, Race.ELF, ELVEN_KNIGHT), + ELVEN_SCOUT(22, false, Race.ELF, ELVEN_FIGHTER), + PLAINS_WALKER(23, false, Race.ELF, ELVEN_SCOUT), + SILVER_RANGER(24, false, Race.ELF, ELVEN_SCOUT), + + ELVEN_MAGE(25, true, Race.ELF, null), + ELVEN_WIZARD(26, true, Race.ELF, ELVEN_MAGE), + SPELLSINGER(27, true, Race.ELF, ELVEN_WIZARD), + ELEMENTAL_SUMMONER(28, true, true, Race.ELF, ELVEN_WIZARD), + ORACLE(29, true, Race.ELF, ELVEN_MAGE), + ELDER(30, true, Race.ELF, ORACLE), + + DARK_FIGHTER(31, false, Race.DARK_ELF, null), + PALUS_KNIGHT(32, false, Race.DARK_ELF, DARK_FIGHTER), + SHILLIEN_KNIGHT(33, false, Race.DARK_ELF, PALUS_KNIGHT), + BLADEDANCER(34, false, Race.DARK_ELF, PALUS_KNIGHT), + ASSASSIN(35, false, Race.DARK_ELF, DARK_FIGHTER), + ABYSS_WALKER(36, false, Race.DARK_ELF, ASSASSIN), + PHANTOM_RANGER(37, false, Race.DARK_ELF, ASSASSIN), + + DARK_MAGE(38, true, Race.DARK_ELF, null), + DARK_WIZARD(39, true, Race.DARK_ELF, DARK_MAGE), + SPELLHOWLER(40, true, Race.DARK_ELF, DARK_WIZARD), + PHANTOM_SUMMONER(41, true, true, Race.DARK_ELF, DARK_WIZARD), + SHILLIEN_ORACLE(42, true, Race.DARK_ELF, DARK_MAGE), + SHILLIEN_ELDER(43, true, Race.DARK_ELF, SHILLIEN_ORACLE), + + ORC_FIGHTER(44, false, Race.ORC, null), + ORC_RAIDER(45, false, Race.ORC, ORC_FIGHTER), + DESTROYER(46, false, Race.ORC, ORC_RAIDER), + ORC_MONK(47, false, Race.ORC, ORC_FIGHTER), + TYRANT(48, false, Race.ORC, ORC_MONK), + + ORC_MAGE(49, true, Race.ORC, null), + ORC_SHAMAN(50, true, Race.ORC, ORC_MAGE), + OVERLORD(51, true, Race.ORC, ORC_SHAMAN), + WARCRYER(52, true, Race.ORC, ORC_SHAMAN), + + DWARVEN_FIGHTER(53, false, Race.DWARF, null), + SCAVENGER(54, false, Race.DWARF, DWARVEN_FIGHTER), + BOUNTY_HUNTER(55, false, Race.DWARF, SCAVENGER), + ARTISAN(56, false, Race.DWARF, DWARVEN_FIGHTER), + WARSMITH(57, false, Race.DWARF, ARTISAN), + + DUELIST(88, false, Race.HUMAN, GLADIATOR), + DREADNOUGHT(89, false, Race.HUMAN, WARLORD), + PHOENIX_KNIGHT(90, false, Race.HUMAN, PALADIN), + HELL_KNIGHT(91, false, Race.HUMAN, DARK_AVENGER), + SAGITTARIUS(92, false, Race.HUMAN, HAWKEYE), + ADVENTURER(93, false, Race.HUMAN, TREASURE_HUNTER), + ARCHMAGE(94, true, Race.HUMAN, SORCERER), + SOULTAKER(95, true, Race.HUMAN, NECROMANCER), + ARCANA_LORD(96, true, true, Race.HUMAN, WARLOCK), + CARDINAL(97, true, Race.HUMAN, BISHOP), + HIEROPHANT(98, true, Race.HUMAN, PROPHET), + + EVA_TEMPLAR(99, false, Race.ELF, TEMPLE_KNIGHT), + SWORD_MUSE(100, false, Race.ELF, SWORDSINGER), + WIND_RIDER(101, false, Race.ELF, PLAINS_WALKER), + MOONLIGHT_SENTINEL(102, false, Race.ELF, SILVER_RANGER), + MYSTIC_MUSE(103, true, Race.ELF, SPELLSINGER), + ELEMENTAL_MASTER(104, true, true, Race.ELF, ELEMENTAL_SUMMONER), + EVA_SAINT(105, true, Race.ELF, ELDER), + + SHILLIEN_TEMPLAR(106, false, Race.DARK_ELF, SHILLIEN_KNIGHT), + SPECTRAL_DANCER(107, false, Race.DARK_ELF, BLADEDANCER), + GHOST_HUNTER(108, false, Race.DARK_ELF, ABYSS_WALKER), + GHOST_SENTINEL(109, false, Race.DARK_ELF, PHANTOM_RANGER), + STORM_SCREAMER(110, true, Race.DARK_ELF, SPELLHOWLER), + SPECTRAL_MASTER(111, true, true, Race.DARK_ELF, PHANTOM_SUMMONER), + SHILLIEN_SAINT(112, true, Race.DARK_ELF, SHILLIEN_ELDER), + + TITAN(113, false, Race.ORC, DESTROYER), + GRAND_KHAVATARI(114, false, Race.ORC, TYRANT), + DOMINATOR(115, true, Race.ORC, OVERLORD), + DOOMCRYER(116, true, Race.ORC, WARCRYER), + + FORTUNE_SEEKER(117, false, Race.DWARF, BOUNTY_HUNTER), + MAESTRO(118, false, Race.DWARF, WARSMITH), + + MALE_SOLDIER(123, false, Race.KAMAEL, null), + FEMALE_SOLDIER(124, false, Race.KAMAEL, null), + TROOPER(125, false, Race.KAMAEL, MALE_SOLDIER), + WARDER(126, false, Race.KAMAEL, FEMALE_SOLDIER), + BERSERKER(127, false, Race.KAMAEL, TROOPER), + MALE_SOULBREAKER(128, false, Race.KAMAEL, TROOPER), + FEMALE_SOULBREAKER(129, false, Race.KAMAEL, WARDER), + ARBALESTER(130, false, Race.KAMAEL, WARDER), + DOOMBRINGER(131, false, Race.KAMAEL, BERSERKER), + MALE_SOUL_HOUND(132, false, Race.KAMAEL, MALE_SOULBREAKER), + FEMALE_SOUL_HOUND(133, false, Race.KAMAEL, FEMALE_SOULBREAKER), + TRICKSTER(134, false, Race.KAMAEL, ARBALESTER), + INSPECTOR(135, false, Race.KAMAEL, WARDER), + JUDICATOR(136, false, Race.KAMAEL, INSPECTOR), + + SIGEL_KNIGHT(139, false, null, null), + TYRR_WARRIOR(140, false, null, null), + OTHELL_ROGUE(141, false, null, null), + YUL_ARCHER(142, false, null, null), + FEOH_WIZARD(143, false, null, null), + ISS_ENCHANTER(144, false, null, null), + WYNN_SUMMONER(145, false, null, null), + AEORE_HEALER(146, false, null, null), + + SIGEL_PHOENIX_KNIGHT(148, false, Race.HUMAN, PHOENIX_KNIGHT), + SIGEL_HELL_KNIGHT(149, false, Race.HUMAN, HELL_KNIGHT), + SIGEL_EVA_TEMPLAR(150, false, Race.ELF, EVA_TEMPLAR), + SIGEL_SHILLIEN_TEMPLAR(151, false, Race.DARK_ELF, SHILLIEN_TEMPLAR), + TYRR_DUELIST(152, false, Race.HUMAN, DUELIST), + TYRR_DREADNOUGHT(153, false, Race.HUMAN, DREADNOUGHT), + TYRR_TITAN(154, false, Race.ORC, TITAN), + TYRR_GRAND_KHAVATARI(155, false, Race.ORC, GRAND_KHAVATARI), + TYRR_MAESTRO(156, false, Race.DWARF, MAESTRO), + TYRR_DOOMBRINGER(157, false, Race.KAMAEL, DOOMBRINGER), + OTHELL_ADVENTURER(158, false, Race.HUMAN, ADVENTURER), + OTHELL_WIND_RIDER(159, false, Race.ELF, WIND_RIDER), + OTHELL_GHOST_HUNTER(160, false, Race.DARK_ELF, GHOST_HUNTER), + OTHELL_FORTUNE_SEEKER(161, false, Race.DWARF, FORTUNE_SEEKER), + YUL_SAGITTARIUS(162, false, Race.HUMAN, SAGITTARIUS), + YUL_MOONLIGHT_SENTINEL(163, false, Race.ELF, MOONLIGHT_SENTINEL), + YUL_GHOST_SENTINEL(164, false, Race.DARK_ELF, GHOST_SENTINEL), + YUL_TRICKSTER(165, false, Race.KAMAEL, TRICKSTER), + FEOH_ARCHMAGE(166, true, Race.HUMAN, ARCHMAGE), + FEOH_SOULTAKER(167, true, Race.HUMAN, SOULTAKER), + FEOH_MYSTIC_MUSE(168, true, Race.ELF, MYSTIC_MUSE), + FEOH_STORM_SCREAMER(169, true, Race.DARK_ELF, STORM_SCREAMER), + FEOH_SOUL_HOUND(170, true, Race.KAMAEL, MALE_SOUL_HOUND), // fix me ? + ISS_HIEROPHANT(171, true, Race.HUMAN, HIEROPHANT), + ISS_SWORD_MUSE(172, false, Race.ELF, SWORD_MUSE), + ISS_SPECTRAL_DANCER(173, false, Race.DARK_ELF, SPECTRAL_DANCER), + ISS_DOMINATOR(174, true, Race.ORC, DOMINATOR), + ISS_DOOMCRYER(175, true, Race.ORC, DOOMCRYER), + WYNN_ARCANA_LORD(176, true, true, Race.HUMAN, ARCANA_LORD), + WYNN_ELEMENTAL_MASTER(177, true, true, Race.ELF, ELEMENTAL_MASTER), + WYNN_SPECTRAL_MASTER(178, true, true, Race.DARK_ELF, SPECTRAL_MASTER), + AEORE_CARDINAL(179, true, Race.HUMAN, CARDINAL), + AEORE_EVA_SAINT(180, true, Race.ELF, EVA_SAINT), + AEORE_SHILLIEN_SAINT(181, true, Race.DARK_ELF, SHILLIEN_SAINT), + + ERTHEIA_FIGHTER(182, false, Race.ERTHEIA, null), + ERTHEIA_WIZARD(183, true, Race.ERTHEIA, null), + + MARAUDER(184, false, Race.ERTHEIA, ERTHEIA_FIGHTER), + CLOUD_BREAKER(185, true, Race.ERTHEIA, ERTHEIA_WIZARD), + + RIPPER(186, false, Race.ERTHEIA, MARAUDER), + STRATOMANCER(187, true, Race.ERTHEIA, CLOUD_BREAKER), + + EVISCERATOR(188, false, Race.ERTHEIA, RIPPER), + SAYHA_SEER(189, true, Race.ERTHEIA, STRATOMANCER); + + /** The Identifier of the Class */ + private final int _id; + + /** True if the class is a mage class */ + private final boolean _isMage; + + /** True if the class is a summoner class */ + private final boolean _isSummoner; + + /** The Race object of the class */ + private final Race _race; + + /** The parent ClassId or null if this class is a root */ + private final ClassId _parent; + + /** List of available Class for next transfer **/ + private final Set _nextClassIds = new HashSet<>(1); + + private static Map _classIdMap = new HashMap<>(ClassId.values().length); + static + { + for (ClassId classId : ClassId.values()) + { + _classIdMap.put(classId.getId(), classId); + } + } + + public static ClassId getClassId(int cId) + { + return _classIdMap.get(cId); + } + + /** + * Class constructor. + * @param pId the class Id. + * @param pIsMage {code true} if the class is mage class. + * @param race the race related to the class. + * @param pParent the parent class Id. + */ + private ClassId(int pId, boolean pIsMage, Race race, ClassId pParent) + { + _id = pId; + _isMage = pIsMage; + _isSummoner = false; + _race = race; + _parent = pParent; + + if (_parent != null) + { + _parent.addNextClassId(this); + } + } + + /** + * Class constructor. + * @param pId the class Id. + * @param pIsMage {code true} if the class is mage class. + * @param pIsSummoner {code true} if the class is summoner class. + * @param race the race related to the class. + * @param pParent the parent class Id. + */ + private ClassId(int pId, boolean pIsMage, boolean pIsSummoner, Race race, ClassId pParent) + { + _id = pId; + _isMage = pIsMage; + _isSummoner = pIsSummoner; + _race = race; + _parent = pParent; + + if (_parent != null) + { + _parent.addNextClassId(this); + } + } + + /** + * Gets the ID of the class. + * @return the ID of the class + */ + @Override + public int getId() + { + return _id; + } + + /** + * @return {code true} if the class is a mage class. + */ + public boolean isMage() + { + return _isMage; + } + + /** + * @return {code true} if the class is a summoner class. + */ + public boolean isSummoner() + { + return _isSummoner; + } + + /** + * @return the Race object of the class. + */ + public Race getRace() + { + return _race; + } + + /** + * @param cid the parent ClassId to check. + * @return {code true} if this Class is a child of the selected ClassId. + */ + public boolean childOf(ClassId cid) + { + if (_parent == null) + { + return false; + } + + if (_parent == cid) + { + return true; + } + + return _parent.childOf(cid); + } + + /** + * @param cid the parent ClassId to check. + * @return {code true} if this Class is equal to the selected ClassId or a child of the selected ClassId. + */ + public boolean equalsOrChildOf(ClassId cid) + { + return (this == cid) || childOf(cid); + } + + /** + * @return the child level of this Class (0=root, 1=child leve 1...) + */ + public int level() + { + if (_parent == null) + { + return 0; + } + + return 1 + _parent.level(); + } + + /** + * @return its parent Class Id + */ + public ClassId getParent() + { + return _parent; + } + + public ClassId getRootClassId() + { + if (_parent != null) + { + return _parent.getRootClassId(); + } + return this; + } + + /** + * @return list of possible class transfer for this class + */ + public Set getNextClassIds() + { + return _nextClassIds; + } + + private final void addNextClassId(ClassId cId) + { + _nextClassIds.add(cId); + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/PlayerState.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/PlayerState.java new file mode 100644 index 0000000000..fc67134f9f --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/PlayerState.java @@ -0,0 +1,30 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.enums; + +public enum PlayerState +{ + RESTING, + MOVING, + RUNNING, + STANDING, + FLYING, + BEHIND, + FRONT, + CHAOTIC, + OLYMPIAD +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/SocialClass.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/SocialClass.java new file mode 100644 index 0000000000..b479370447 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/SocialClass.java @@ -0,0 +1,39 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.enums; + +/** + * Enumerated for Social Classes. + * @author Zoey76 + */ +public enum SocialClass +{ + VAGABOND, + VASSAL, + APPRENTICE, + HEIR, + KNIGHT, + ELDER, + BARON, + VISCOUNT, + COUNT, + MARQUIS, + DUKE, + GRAND_DUKE, + DISTINGUISHED_KING, + EMPEROR +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 6bc30f2206..2618c1b7b1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager implements InstanceListManager { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e9aac43188..3d8c1f50e4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.model.SeedProduction; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.interfaces.IStorable; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index fd4c86c7e9..380d97e557 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -23,10 +23,10 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clanhallauction.ClanHallAuction; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; +import org.l2jmobius.gameserver.model.residences.ClanHallAuction; /** * @author Sdw diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java index 1daea8553c..781c07913c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -38,11 +38,11 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.CommissionManagerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.commission.CommissionItem; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.items.Item; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java index 054c6f4bcc..dd530dd6d3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CustomMailManager.java @@ -30,9 +30,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 59592aa285..3b3396c316 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -31,13 +31,13 @@ import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.eventengine.AbstractEventManager; import org.l2jmobius.gameserver.model.eventengine.ScheduleTarget; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; @@ -111,7 +111,7 @@ public class DailyTaskManager extends AbstractEventManager> for (PlayerInstance player : World.getInstance().getPlayers()) { player.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS, false); - for (SubClass subclass : player.getSubClasses().values()) + for (SubClassHolder subclass : player.getSubClasses().values()) { subclass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index a551a07de0..233bea17ac 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java index 30b289b8b6..767c90e4ba 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.InstanceListManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Fort; public class FortManager implements InstanceListManager { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index b5718c1ebd..cbc70a9567 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,9 +38,9 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.FortSiege; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MailManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MailManager.java index 2a82541b39..8fa771c248 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MailManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MailManager.java @@ -31,9 +31,9 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Message; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostArrived; import org.l2jmobius.gameserver.network.serverpackets.ExUnReadMailCount; import org.l2jmobius.gameserver.taskmanager.MessageDeletionTaskManager; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 0b7b56439c..920d974e48 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.type.RespawnZone; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java index aa5fe75760..b3d0504beb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java @@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.MatchingRoomType; import org.l2jmobius.gameserver.enums.PartyMatchingRoomLevelType; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.matching.MatchingRoom; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index a926d9b04b..78cf922b7f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -34,10 +34,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.DefenderInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; /** * Siege Guard Manager. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index d65e7ac73a..b06a6774aa 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.TowerSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; public class SiegeManager diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java new file mode 100644 index 0000000000..c0cc276691 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/events/GameEvent.java @@ -0,0 +1,548 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.instancemanager.events; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.Config; +import org.l2jmobius.gameserver.cache.HtmCache; +import org.l2jmobius.gameserver.data.SpawnTable; +import org.l2jmobius.gameserver.data.xml.NpcData; +import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; +import org.l2jmobius.gameserver.model.Spawn; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.holders.PlayerEventHolder; +import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; + +/** + * @author Nik + * @Since 2011/05/17 21:51:39 + */ +public class GameEvent +{ + protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName()); + public static EventState eventState = EventState.OFF; + public static String _eventName = ""; + public static String _eventCreator = ""; + public static String _eventInfo = ""; + public static int _teamsNumber = 0; + public static final Map _teamNames = new ConcurrentHashMap<>(); + public static final Set _registeredPlayers = ConcurrentHashMap.newKeySet(); + public static final Map> _teams = new ConcurrentHashMap<>(); + public static int _npcId = 0; + private static final Map _connectionLossData = new ConcurrentHashMap<>(); + + public enum EventState + { + OFF, // Not running + STANDBY, // Waiting for participants to register + ON // Registration is over and the event has started. + } + + /** + * @param player + * @return The team ID where the player is in, or -1 if player is null or team not found. + */ + public static int getPlayerTeamId(PlayerInstance player) + { + if (player == null) + { + return -1; + } + + for (Entry> team : _teams.entrySet()) + { + if (team.getValue().contains(player)) + { + return team.getKey(); + } + } + + return -1; + } + + public static List getTopNKillers(int n) + { + final Map tmp = new HashMap<>(); + for (Set teamList : _teams.values()) + { + for (PlayerInstance player : teamList) + { + if (player.getEventStatus() == null) + { + continue; + } + tmp.put(player, player.getEventStatus().getKills().size()); + } + } + + sortByValue(tmp); + + // If the map size is less than "n", n will be as much as the map size + if (tmp.size() <= n) + { + return new ArrayList<>(tmp.keySet()); + } + + final List toReturn = new ArrayList<>(tmp.keySet()); + return toReturn.subList(1, n); + } + + public static void showEventHtml(PlayerInstance player, String objectid) + { + // TODO: work on this + if (eventState == EventState.STANDBY) + { + try + { + final String htmContent; + final NpcHtmlMessage html = new NpcHtmlMessage(Integer.parseInt(objectid)); + if (_registeredPlayers.contains(player)) + { + htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm"); + } + else + { + htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm"); + } + + if (htmContent != null) + { + html.setHtml(htmContent); + } + + html.replace("%objectId%", objectid); // Yeah, we need this. + html.replace("%eventName%", _eventName); + html.replace("%eventCreator%", _eventCreator); + html.replace("%eventInfo%", _eventInfo); + player.sendPacket(html); + } + catch (Exception e) + { + LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); + } + } + } + + /** + * Spawns an event participation NPC near the player. The npc id used to spawning is GameEvent._npcId + * @param target + */ + public static void spawnEventNpc(PlayerInstance target) + { + try + { + final Spawn spawn = new Spawn(_npcId); + spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ()); + spawn.setAmount(1); + spawn.setHeading(target.getHeading()); + spawn.stopRespawn(); + SpawnTable.getInstance().addNewSpawn(spawn, false); + spawn.init(); + spawn.getLastSpawn().setCurrentHp(999999999); + spawn.getLastSpawn().setTitle(_eventName); + spawn.getLastSpawn().getVariables().set("eventmob", true); + spawn.getLastSpawn().setInvul(true); + // spawn.getLastSpawn().decayMe(); + // spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ()); + spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1)); + + // _npcs.add(spawn.getLastSpawn()); + } + catch (Exception e) + { + LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); + } + } + + /** + * Zoey76: TODO: Rewrite this in a way that doesn't iterate over all spawns. + */ + public static void unspawnEventNpcs() + { + SpawnTable.getInstance().forEachSpawn(spawn -> + { + final Npc npc = spawn.getLastSpawn(); + if ((npc != null) && npc.getVariables().getBoolean("eventmob", false)) + { + npc.deleteMe(); + spawn.stopRespawn(); + SpawnTable.getInstance().deleteSpawn(spawn, false); + } + return true; + }); + } + + /** + * @param player + * @return False: If player is null, his event status is null or the event state is off. True: if the player is inside the _registeredPlayers list while the event state is STANDBY. If the event state is ON, it will check if the player is inside in one of the teams. + */ + public static boolean isParticipant(PlayerInstance player) + { + if ((player == null) || (player.getEventStatus() == null)) + { + return false; + } + + switch (eventState) + { + case OFF: + { + return false; + } + case STANDBY: + { + return _registeredPlayers.contains(player); + } + case ON: + { + for (Set teamList : _teams.values()) + { + if (teamList.contains(player)) + { + return true; + } + } + } + } + return false; + } + + /** + * Adds the player to the list of participants. If the event state is NOT STANDBY, the player wont be registered. + * @param player + */ + public static void registerPlayer(PlayerInstance player) + { + if (eventState != EventState.STANDBY) + { + player.sendMessage("The registration period for this event is over."); + return; + } + + if ((Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP)) + { + _registeredPlayers.add(player); + } + else + { + player.sendMessage("You have reached the maximum allowed participants per IP."); + } + } + + /** + * Removes the player from the participating players and the teams and restores his init stats before he registered at the event (loc, pvp, pk, title etc) + * @param player + */ + public static void removeAndResetPlayer(PlayerInstance player) + { + try + { + if (isParticipant(player)) + { + if (player.isDead()) + { + player.restoreExp(100.0); + player.doRevive(); + player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp()); + player.setCurrentCp(player.getMaxCp()); + } + + player.decayMe(); + player.spawnMe(player.getX(), player.getY(), player.getZ()); + player.broadcastUserInfo(); + + player.stopTransformation(true); + } + + if (player.getEventStatus() != null) + { + player.getEventStatus().restorePlayerStats(); + } + + player.setEventStatus(null); + + _registeredPlayers.remove(player); + final int teamId = getPlayerTeamId(player); + if (_teams.containsKey(teamId)) + { + _teams.get(teamId).remove(player); + } + } + catch (Exception e) + { + LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); + } + } + + /** + * The player's event status will be saved at _connectionLossData + * @param player + */ + public static void savePlayerEventStatus(PlayerInstance player) + { + _connectionLossData.put(player, player.getEventStatus()); + } + + /** + * If _connectionLossData contains the player, it will restore the player's event status. Also it will remove the player from the _connectionLossData. + * @param player + */ + public static void restorePlayerEventStatus(PlayerInstance player) + { + if (_connectionLossData.containsKey(player)) + { + player.setEventStatus(_connectionLossData.get(player)); + _connectionLossData.remove(player); + } + } + + /** + * If the event is ON or STANDBY, it will not start. Sets the event state to STANDBY and spawns registration NPCs + * @return a string with information if the event participation has been successfully started or not. + */ + public static String startEventParticipation() + { + try + { + switch (eventState) + { + case ON: + { + return "Cannot start event, it is already on."; + } + case STANDBY: + { + return "Cannot start event, it is on standby mode."; + } + case OFF: // Event is off, so no problem turning it on. + { + eventState = EventState.STANDBY; + break; + } + } + + // Register the event at AntiFeedManager and clean it for just in case if the event is already registered. + AntiFeedManager.getInstance().registerEvent(AntiFeedManager.L2EVENT_ID); + AntiFeedManager.getInstance().clear(AntiFeedManager.L2EVENT_ID); + + // Just in case + unspawnEventNpcs(); + _registeredPlayers.clear(); + // _npcs.clear(); + if (NpcData.getInstance().getTemplate(_npcId) == null) + { + return "Cannot start event, invalid npc id."; + } + + try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/data/events/" + _eventName); + BufferedReader br = new BufferedReader(fr)) + { + _eventCreator = br.readLine(); + _eventInfo = br.readLine(); + } + + final Set temp = new HashSet<>(); + for (PlayerInstance player : World.getInstance().getPlayers()) + { + if (!player.isOnline()) + { + continue; + } + + if (!temp.contains(player)) + { + spawnEventNpc(player); + temp.add(player); + } + + World.getInstance().forEachVisibleObjectInRange(player, PlayerInstance.class, 1000, temp::add); + } + } + catch (Exception e) + { + LOGGER.warning("Event: " + e.getMessage()); + return "Cannot start event participation, an error has occured."; + } + + return "The event participation has been successfully started."; + } + + /** + * If the event is ON or OFF, it will not start. Sets the event state to ON, creates the teams, adds the registered players ordered by level at the teams and adds a new event status to the players. + * @return a string with information if the event has been successfully started or not. + */ + public static String startEvent() + { + try + { + switch (eventState) + { + case ON: + { + return "Cannot start event, it is already on."; + } + case STANDBY: + { + eventState = EventState.ON; + break; + } + case OFF: // Event is off, so no problem turning it on. + { + return "Cannot start event, it is off. Participation start is required."; + } + } + + // Clean the things we will use, just in case. + unspawnEventNpcs(); + _teams.clear(); + _connectionLossData.clear(); + + // Insert empty lists at _teams. + for (int i = 0; i < _teamsNumber; i++) + { + _teams.put(i + 1, ConcurrentHashMap.newKeySet()); + } + + int i = 0; + while (!_registeredPlayers.isEmpty()) + { + // Get the player with the biggest level + int max = 0; + PlayerInstance biggestLvlPlayer = null; + for (PlayerInstance player : _registeredPlayers) + { + if (player == null) + { + continue; + } + + if (max < player.getLevel()) + { + max = player.getLevel(); + biggestLvlPlayer = player; + } + } + + if (biggestLvlPlayer == null) + { + continue; + } + + _registeredPlayers.remove(biggestLvlPlayer); + _teams.get(i + 1).add(biggestLvlPlayer); + biggestLvlPlayer.setEventStatus(); + i = (i + 1) % _teamsNumber; + } + } + catch (Exception e) + { + LOGGER.warning("Event: " + e.getMessage()); + return "Cannot start event, an error has occured."; + } + + return "The event has been successfully started."; + } + + /** + * If the event state is OFF, it will not finish. Sets the event state to OFF, unregisters and resets the players, unspawns and clers the event NPCs, clears the teams, registered players, connection loss data, sets the teams number to 0, sets the event name to empty. + * @return a string with information if the event has been successfully stopped or not. + */ + public static String finishEvent() + { + switch (eventState) + { + case OFF: + { + return "Cannot finish event, it is already off."; + } + case STANDBY: + { + for (PlayerInstance player : _registeredPlayers) + { + removeAndResetPlayer(player); + } + + unspawnEventNpcs(); + // _npcs.clear(); + _registeredPlayers.clear(); + _teams.clear(); + _connectionLossData.clear(); + _teamsNumber = 0; + _eventName = ""; + eventState = EventState.OFF; + return "The event has been stopped at STANDBY mode, all players unregistered and all event npcs unspawned."; + } + case ON: + { + for (Set teamList : _teams.values()) + { + for (PlayerInstance player : teamList) + { + removeAndResetPlayer(player); + } + } + + eventState = EventState.OFF; + AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID); + unspawnEventNpcs(); // Just in case + // _npcs.clear(); + _registeredPlayers.clear(); + _teams.clear(); + _connectionLossData.clear(); + _teamsNumber = 0; + _eventName = ""; + _npcId = 0; + _eventCreator = ""; + _eventInfo = ""; + return "The event has been stopped, all players unregistered and all event npcs unspawned."; + } + } + + return "The event has been successfully finished."; + } + + private static Map sortByValue(Map unsortMap) + { + final List> list = new LinkedList<>(unsortMap.entrySet()); + list.sort(Comparator.comparing(Entry::getValue)); + + final Map sortedMap = new LinkedHashMap<>(); + for (Entry entry : list) + { + sortedMap.put(entry.getKey(), entry.getValue()); + } + return sortedMap; + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java new file mode 100644 index 0000000000..687d1288b9 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -0,0 +1,762 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.instancemanager.games; + +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledFuture; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.commons.concurrent.ThreadPool; +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.SpawnTable; +import org.l2jmobius.gameserver.data.xml.NpcData; +import org.l2jmobius.gameserver.data.xml.SkillData; +import org.l2jmobius.gameserver.enums.Team; +import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; +import org.l2jmobius.gameserver.model.Spawn; +import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; +import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; +import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; +import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; +import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameCloseUI; +import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameEnd; +import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; +import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; + +/** + * @author BiggBoss + */ +public class BlockChecker +{ + protected static final Logger LOGGER = Logger.getLogger(BlockChecker.class.getName()); + // The object which holds all basic members info + protected ArenaParticipantsHolder _holder; + // Maps to hold player of each team and his points + protected Map _redTeamPoints = new ConcurrentHashMap<>(); + protected Map _blueTeamPoints = new ConcurrentHashMap<>(); + // The initial points of the event + protected int _redPoints = 15; + protected int _bluePoints = 15; + // Current used arena + protected int _arena = -1; + // All blocks + protected Set _spawns = ConcurrentHashMap.newKeySet(); + // Sets if the red team won the event at the end of this (used for packets) + protected boolean _isRedWinner; + // Time when the event starts. Used on packet sending + protected long _startedTime; + // The needed arena coordinates + // Arena X: team1X, team1Y, team2X, team2Y, ArenaCenterX, ArenaCenterY + protected static final int[][] _arenaCoordinates = + { + // Arena 0 - Team 1 XY, Team 2 XY - CENTER XY + { + -58368, + -62745, + -57751, + -62131, + -58053, + -62417 + }, + // Arena 1 - Team 1 XY, Team 2 XY - CENTER XY + { + -58350, + -63853, + -57756, + -63266, + -58053, + -63551 + }, + // Arena 2 - Team 1 XY, Team 2 XY - CENTER XY + { + -57194, + -63861, + -56580, + -63249, + -56886, + -63551 + }, + // Arena 3 - Team 1 XY, Team 2 XY - CENTER XY + { + -57200, + -62727, + -56584, + -62115, + -56850, + -62391 + } + }; + // Common z coordinate + private static final int Z_COORD = -2405; + // List of dropped items in event (for later deletion) + protected Set _drops = ConcurrentHashMap.newKeySet(); + // Default arena + private static final byte DEFAULT_ARENA = -1; + // Event is started + protected boolean _isStarted = false; + // Event end + protected ScheduledFuture _task; + // Preserve from exploit reward by logging out + protected boolean _abnormalEnd = false; + + public BlockChecker(ArenaParticipantsHolder holder, int arena) + { + _holder = holder; + if ((arena > -1) && (arena < 4)) + { + _arena = arena; + } + + for (PlayerInstance player : holder.getRedPlayers()) + { + _redTeamPoints.put(player, 0); + } + for (PlayerInstance player : holder.getBluePlayers()) + { + _blueTeamPoints.put(player, 0); + } + } + + /** + * Updates the player holder before the event starts to synchronize all info + * @param holder + */ + public void updatePlayersOnStart(ArenaParticipantsHolder holder) + { + _holder = holder; + } + + /** + * Returns the current holder object of this object engine + * @return HandysBlockCheckerManager.ArenaParticipantsHolder + */ + public ArenaParticipantsHolder getHolder() + { + return _holder; + } + + /** + * Will return the id of the arena used by this event + * @return false; + */ + public int getArena() + { + return _arena; + } + + /** + * Returns the time when the event started + * @return long + */ + public long getStarterTime() + { + return _startedTime; + } + + /** + * Returns the current red team points + * @return int + */ + public int getRedPoints() + { + synchronized (this) + { + return _redPoints; + } + } + + /** + * Returns the current blue team points + * @return int + */ + public int getBluePoints() + { + synchronized (this) + { + return _bluePoints; + } + } + + /** + * Returns the player points + * @param player + * @param isRed + * @return int + */ + public int getPlayerPoints(PlayerInstance player, boolean isRed) + { + if (!_redTeamPoints.containsKey(player) && !_blueTeamPoints.containsKey(player)) + { + return 0; + } + + if (isRed) + { + return _redTeamPoints.get(player); + } + return _blueTeamPoints.get(player); + } + + /** + * Increases player points for his teams + * @param player + * @param team + */ + public synchronized void increasePlayerPoints(PlayerInstance player, int team) + { + if (player == null) + { + return; + } + + if (team == 0) + { + final int points = _redTeamPoints.get(player) + 1; + _redTeamPoints.put(player, points); + _redPoints++; + _bluePoints--; + } + else + { + final int points = _blueTeamPoints.get(player) + 1; + _blueTeamPoints.put(player, points); + _bluePoints++; + _redPoints--; + } + } + + /** + * Will add a new drop into the list of dropped items + * @param item + */ + public void addNewDrop(ItemInstance item) + { + if (item != null) + { + _drops.add(item); + } + } + + /** + * Will return true if the event is already started + * @return boolean + */ + public boolean isStarted() + { + return _isStarted; + } + + /** + * Will send all packets for the event members with the relation info + * @param plr + */ + protected void broadcastRelationChanged(PlayerInstance plr) + { + for (PlayerInstance p : _holder.getAllPlayers()) + { + p.sendPacket(new RelationChanged(plr, plr.getRelation(p), plr.isAutoAttackable(p))); + } + } + + /** + * Called when a there is an empty team. The event will end. + */ + public void endEventAbnormally() + { + try + { + synchronized (this) + { + _isStarted = false; + if (_task != null) + { + _task.cancel(true); + } + + _abnormalEnd = true; + ThreadPool.execute(new EndEvent()); + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); + } + } + + /** + * This inner class set ups all player and arena parameters to start the event + */ + public class StartEvent implements Runnable + { + // In event used skills + private final Skill _freeze; + private final Skill _transformationRed; + private final Skill _transformationBlue; + // Common and unparametizer packet + private final ExCubeGameCloseUI _closeUserInterface = ExCubeGameCloseUI.STATIC_PACKET; + + public StartEvent() + { + // Initialize all used skills + _freeze = SkillData.getInstance().getSkill(6034, 1); + _transformationRed = SkillData.getInstance().getSkill(6035, 1); + _transformationBlue = SkillData.getInstance().getSkill(6036, 1); + } + + /** + * Will set up all player parameters and port them to their respective location based on their teams + */ + private void setUpPlayers() + { + // Set current arena as being used + HandysBlockCheckerManager.getInstance().setArenaBeingUsed(_arena); + + // Initialize packets avoiding create a new one per player + _redPoints = _spawns.size() / 2; + _bluePoints = _spawns.size() / 2; + final ExCubeGameChangePoints initialPoints = new ExCubeGameChangePoints(300, _bluePoints, _redPoints); + ExCubeGameExtendedChangePoints clientSetUp; + for (PlayerInstance player : _holder.getAllPlayers()) + { + if (player == null) + { + continue; + } + + // Send the secret client packet set up + final boolean isRed = _holder.getRedPlayers().contains(player); + clientSetUp = new ExCubeGameExtendedChangePoints(300, _bluePoints, _redPoints, isRed, player, 0); + player.sendPacket(clientSetUp); + + player.sendPacket(ActionFailed.STATIC_PACKET); + + // Teleport Player - Array access + // Team 0 * 2 = 0; 0 = 0, 0 + 1 = 1. + // Team 1 * 2 = 2; 2 = 2, 2 + 1 = 3 + final int tc = _holder.getPlayerTeam(player) * 2; + // Get x and y coordinates + final int x = _arenaCoordinates[_arena][tc]; + final int y = _arenaCoordinates[_arena][tc + 1]; + player.teleToLocation(x, y, Z_COORD); + // Set the player team + if (isRed) + { + _redTeamPoints.put(player, 0); + player.setTeam(Team.RED); + } + else + { + _blueTeamPoints.put(player, 0); + player.setTeam(Team.BLUE); + } + player.stopAllEffects(); + final Summon pet = player.getPet(); + if (pet != null) + { + pet.unSummon(player); + } + player.getServitors().values().forEach(s -> s.unSummon(player)); + + // Give the player start up effects + // Freeze + _freeze.applyEffects(player, player); + // Transformation + if (_holder.getPlayerTeam(player) == 0) + { + _transformationRed.applyEffects(player, player); + } + else + { + _transformationBlue.applyEffects(player, player); + } + // Set the current player arena + player.setBlockCheckerArena((byte) _arena); + player.setInsideZone(ZoneId.PVP, true); + // Send needed packets + player.sendPacket(initialPoints); + player.sendPacket(_closeUserInterface); + // ExBasicActionList + player.sendPacket(ExBasicActionList.STATIC_PACKET); + broadcastRelationChanged(player); + } + } + + @Override + public void run() + { + // Wrong arena passed, stop event + if (_arena == -1) + { + LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); + return; + } + _isStarted = true; + // Spawn the blocks + ThreadPool.execute(new SpawnRound(16, 1)); + // Start up player parameters + setUpPlayers(); + // Set the started time + _startedTime = System.currentTimeMillis() + 300000; + } + } + + /** + * This class spawns the second round of boxes and schedules the event end + */ + private class SpawnRound implements Runnable + { + int _numOfBoxes; + int _round; + + SpawnRound(int numberOfBoxes, int round) + { + _numOfBoxes = numberOfBoxes; + _round = round; + } + + @Override + public void run() + { + if (!_isStarted) + { + return; + } + + switch (_round) + { + case 1: // Schedule second spawn round + { + _task = ThreadPool.schedule(new SpawnRound(20, 2), 60000); + break; + } + case 2: // Schedule third spawn round + { + _task = ThreadPool.schedule(new SpawnRound(14, 3), 60000); + break; + } + case 3: // Schedule Event End Count Down + { + _task = ThreadPool.schedule(new EndEvent(), 180000); + break; + } + } + // random % 2, if == 0 will spawn a red block + // if != 0, will spawn a blue block + byte random = 2; + // common template + final NpcTemplate template = NpcData.getInstance().getTemplate(18672); + // Spawn blocks + try + { + // Creates 50 new blocks + for (int i = 0; i < _numOfBoxes; i++) + { + final Spawn spawn = new Spawn(template); + spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), Z_COORD); + spawn.setAmount(1); + spawn.setHeading(1); + spawn.setRespawnDelay(1); + SpawnTable.getInstance().addNewSpawn(spawn, false); + spawn.init(); + final BlockInstance block = (BlockInstance) spawn.getLastSpawn(); + // switch color + block.setRed((random % 2) == 0); + block.disableCoreAI(true); + _spawns.add(spawn); + random++; + } + } + catch (Exception e) + { + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); + } + + // Spawn the block carrying girl + if ((_round == 1) || (_round == 2)) + { + try + { + final Spawn girlSpawn = new Spawn(18676); + girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), Z_COORD); + girlSpawn.setAmount(1); + girlSpawn.setHeading(1); + girlSpawn.setRespawnDelay(1); + SpawnTable.getInstance().addNewSpawn(girlSpawn, false); + girlSpawn.init(); + // Schedule his deletion after 9 secs of spawn + ThreadPool.schedule(new CarryingGirlUnspawn(girlSpawn), 9000); + } + catch (Exception e) + { + LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); + LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); + } + } + + _redPoints += _numOfBoxes / 2; + _bluePoints += _numOfBoxes / 2; + + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); + final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); + _holder.broadCastPacketToTeam(changePoints); + } + } + + private class CarryingGirlUnspawn implements Runnable + { + private final Spawn _spawn; + + protected CarryingGirlUnspawn(Spawn spawn) + { + _spawn = spawn; + } + + @Override + public void run() + { + if (_spawn == null) + { + LOGGER.warning("HBCE: Block Carrying Girl is null"); + return; + } + SpawnTable.getInstance().deleteSpawn(_spawn, false); + _spawn.stopRespawn(); + _spawn.getLastSpawn().deleteMe(); + } + } + + /* + * private class CountDown implements Runnable { + * @Override public void run() { _holder.broadCastPacketToTeam(new SystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.schedule(new EndEvent(), 5000); } } + */ + + /** + * This class erase all event parameters on player and port them back near Handy. Also, unspawn blocks, runs a garbage collector and set as free the used arena + */ + protected class EndEvent implements Runnable + { + // Garbage collector and arena free setter + private void clearMe() + { + HandysBlockCheckerManager.getInstance().clearPaticipantQueueByArenaId(_arena); + _holder.clearPlayers(); + _blueTeamPoints.clear(); + _redTeamPoints.clear(); + HandysBlockCheckerManager.getInstance().setArenaFree(_arena); + + for (Spawn spawn : _spawns) + { + spawn.stopRespawn(); + spawn.getLastSpawn().deleteMe(); + SpawnTable.getInstance().deleteSpawn(spawn, false); + } + _spawns.clear(); + + for (ItemInstance item : _drops) + { + // npe + if (item == null) + { + continue; + } + + // a player has it, it will be deleted later + if (!item.isSpawned() || (item.getOwnerId() != 0)) + { + continue; + } + + item.decayMe(); + } + _drops.clear(); + } + + /** + * Reward players after event. Tie - No Reward + */ + private void rewardPlayers() + { + if (_redPoints == _bluePoints) + { + return; + } + + _isRedWinner = _redPoints > _bluePoints; + if (_isRedWinner) + { + rewardAsWinner(true); + rewardAsLooser(false); + final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); + msg.addString("Red Team"); + _holder.broadCastPacketToTeam(msg); + } + else if (_bluePoints > _redPoints) + { + rewardAsWinner(false); + rewardAsLooser(true); + final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); + msg.addString("Blue Team"); + _holder.broadCastPacketToTeam(msg); + } + else + { + rewardAsLooser(true); + rewardAsLooser(false); + } + } + + /** + * Reward the specified team as a winner team 1) Higher score - 8 extra 2) Higher score - 5 extra + * @param isRed + */ + private void rewardAsWinner(boolean isRed) + { + final Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; + + // Main give + for (Entry points : tempPoints.entrySet()) + { + if (points.getKey() == null) + { + continue; + } + + if (points.getValue() >= 10) + { + points.getKey().addItem("Block Checker", 13067, 2, points.getKey(), true); + } + else + { + tempPoints.remove(points.getKey()); + } + } + + int first = 0; + int second = 0; + PlayerInstance winner1 = null; + PlayerInstance winner2 = null; + for (Entry entry : tempPoints.entrySet()) + { + final PlayerInstance pc = entry.getKey(); + final int pcPoints = entry.getValue(); + if (pcPoints > first) + { + // Move old data + second = first; + winner2 = winner1; + // Set new data + first = pcPoints; + winner1 = pc; + } + else if (pcPoints > second) + { + second = pcPoints; + winner2 = pc; + } + } + if (winner1 != null) + { + winner1.addItem("Block Checker", 13067, 8, winner1, true); + } + if (winner2 != null) + { + winner2.addItem("Block Checker", 13067, 5, winner2, true); + } + } + + /** + * Will reward the looser team with the predefined rewards Player got >= 10 points: 2 coins Player got < 10 points: 0 coins + * @param isRed + */ + private void rewardAsLooser(boolean isRed) + { + for (Entry entry : (isRed ? _redTeamPoints : _blueTeamPoints).entrySet()) + { + final PlayerInstance player = entry.getKey(); + if ((player != null) && (entry.getValue() >= 10)) + { + player.addItem("Block Checker", 13067, 2, player, true); + } + } + } + + /** + * Teleport players back, give status back and send final packet + */ + private void setPlayersBack() + { + final ExCubeGameEnd end = new ExCubeGameEnd(_isRedWinner); + for (PlayerInstance player : _holder.getAllPlayers()) + { + if (player == null) + { + continue; + } + + player.stopAllEffects(); + // Remove team aura + player.setTeam(Team.NONE); + // Set default arena + player.setBlockCheckerArena(DEFAULT_ARENA); + // Remove the event items + final PlayerInventory inv = player.getInventory(); + if (inv.getItemByItemId(13787) != null) + { + inv.destroyItemByItemId("Handys Block Checker", 13787, inv.getInventoryItemCount(13787, 0), player, player); + } + if (inv.getItemByItemId(13788) != null) + { + inv.destroyItemByItemId("Handys Block Checker", 13788, inv.getInventoryItemCount(13788, 0), player, player); + } + broadcastRelationChanged(player); + // Teleport Back + player.teleToLocation(-57478, -60367, -2370); + player.setInsideZone(ZoneId.PVP, false); + // Send end packet + player.sendPacket(end); + player.broadcastUserInfo(); + } + } + + @Override + public void run() + { + if (!_abnormalEnd) + { + rewardPlayers(); + } + setPlayersBack(); + clearMe(); + _isStarted = false; + _abnormalEnd = false; + } + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index e9b0a4dbfc..5da780a150 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -34,14 +34,14 @@ public class ArenaParticipantsHolder private final int _arena; private final List _redPlayers; private final List _bluePlayers; - private final BlockCheckerEngine _engine; + private final BlockChecker _engine; public ArenaParticipantsHolder(int arena) { _arena = arena; _redPlayers = new ArrayList<>(6); _bluePlayers = new ArrayList<>(6); - _engine = new BlockCheckerEngine(this, _arena); + _engine = new BlockChecker(this, _arena); } public List getRedPlayers() @@ -130,7 +130,7 @@ public class ArenaParticipantsHolder _bluePlayers.clear(); } - public BlockCheckerEngine getEvent() + public BlockChecker getEvent() { return _engine; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Couple.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Couple.java new file mode 100644 index 0000000000..dbca7d1e97 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Couple.java @@ -0,0 +1,164 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Calendar; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.commons.database.DatabaseFactory; +import org.l2jmobius.gameserver.instancemanager.IdManager; +import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; + +/** + * @author evill33t + */ +public class Couple +{ + private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); + + private int _id = 0; + private int _player1Id = 0; + private int _player2Id = 0; + private boolean _maried = false; + private Calendar _affiancedDate; + private Calendar _weddingDate; + + public Couple(int coupleId) + { + _id = coupleId; + + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement ps = con.prepareStatement("SELECT * FROM mods_wedding WHERE id = ?")) + { + ps.setInt(1, _id); + try (ResultSet rs = ps.executeQuery()) + { + while (rs.next()) + { + _player1Id = rs.getInt("player1Id"); + _player2Id = rs.getInt("player2Id"); + _maried = rs.getBoolean("married"); + _affiancedDate = Calendar.getInstance(); + _affiancedDate.setTimeInMillis(rs.getLong("affianceDate")); + + _weddingDate = Calendar.getInstance(); + _weddingDate.setTimeInMillis(rs.getLong("weddingDate")); + } + } + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); + } + } + + public Couple(PlayerInstance player1, PlayerInstance player2) + { + final int _tempPlayer1Id = player1.getObjectId(); + final int _tempPlayer2Id = player2.getObjectId(); + _player1Id = _tempPlayer1Id; + _player2Id = _tempPlayer2Id; + _affiancedDate = Calendar.getInstance(); + _affiancedDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis()); + + _weddingDate = Calendar.getInstance(); + _weddingDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis()); + + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement ps = con.prepareStatement("INSERT INTO mods_wedding (id, player1Id, player2Id, married, affianceDate, weddingDate) VALUES (?, ?, ?, ?, ?, ?)")) + { + _id = IdManager.getInstance().getNextId(); + ps.setInt(1, _id); + ps.setInt(2, _player1Id); + ps.setInt(3, _player2Id); + ps.setBoolean(4, false); + ps.setLong(5, _affiancedDate.getTimeInMillis()); + ps.setLong(6, _weddingDate.getTimeInMillis()); + ps.execute(); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); + } + } + + public void marry() + { + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement ps = con.prepareStatement("UPDATE mods_wedding set married = ?, weddingDate = ? where id = ?")) + { + ps.setBoolean(1, true); + _weddingDate = Calendar.getInstance(); + ps.setLong(2, _weddingDate.getTimeInMillis()); + ps.setInt(3, _id); + ps.execute(); + _maried = true; + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); + } + } + + public void divorce() + { + try (Connection con = DatabaseFactory.getConnection(); + PreparedStatement ps = con.prepareStatement("DELETE FROM mods_wedding WHERE id=?")) + { + ps.setInt(1, _id); + ps.execute(); + } + catch (Exception e) + { + LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); + } + } + + public int getId() + { + return _id; + } + + public int getPlayer1Id() + { + return _player1Id; + } + + public int getPlayer2Id() + { + return _player2Id; + } + + public boolean getMaried() + { + return _maried; + } + + public Calendar getAffiancedDate() + { + return _affiancedDate; + } + + public Calendar getWeddingDate() + { + return _weddingDate; + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java index 9875458c7e..0929916ae2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.model; import java.util.List; import java.util.function.Function; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.handler.DailyMissionHandler; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.holders.ItemHolder; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java similarity index 95% rename from L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Duel.java rename to L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java index 0e2fd5cd8a..1033679c51 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Duel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.entity; +package org.l2jmobius.gameserver.model; import java.util.Calendar; import java.util.List; @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.enums.Team; import org.l2jmobius.gameserver.instancemanager.DuelManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.instancezone.Instance; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java new file mode 100644 index 0000000000..e6b1c31d32 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java @@ -0,0 +1,460 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.l2jmobius.gameserver.data.sql.CharNameTable; +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.MailType; +import org.l2jmobius.gameserver.instancemanager.IdManager; +import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.itemcontainer.Mail; +import org.l2jmobius.gameserver.model.items.instance.ItemInstance; + +/** + * @author Migi, DS + */ +public class Message +{ + private static final int EXPIRATION = 360; // 15 days + private static final int COD_EXPIRATION = 12; // 12 hours + + // post state + public static final int DELETED = 0; + public static final int READED = 1; + public static final int REJECTED = 2; + + private final int _messageId; + private final int _senderId; + private final int _receiverId; + private final long _expiration; + private String _senderName = null; + private String _receiverName = null; + private final String _subject; + private final String _content; + private boolean _unread; + private boolean _returned; + private MailType _messageType = MailType.REGULAR; + private boolean _deletedBySender; + private boolean _deletedByReceiver; + private final long _reqAdena; + private boolean _hasAttachments; + private Mail _attachments = null; + + private int _itemId; + private int _enchantLvl; + private final int[] _elementals = new int[6]; + + /* + * Constructor for restoring from DB. + */ + public Message(ResultSet rset) throws SQLException + { + _messageId = rset.getInt("messageId"); + _senderId = rset.getInt("senderId"); + _receiverId = rset.getInt("receiverId"); + _subject = rset.getString("subject"); + _content = rset.getString("content"); + _expiration = rset.getLong("expiration"); + _reqAdena = rset.getLong("reqAdena"); + _hasAttachments = rset.getBoolean("hasAttachments"); + _unread = rset.getBoolean("isUnread"); + _deletedBySender = rset.getBoolean("isDeletedBySender"); + _deletedByReceiver = rset.getBoolean("isDeletedByReceiver"); + _messageType = MailType.values()[rset.getInt("sendBySystem")]; + _returned = rset.getBoolean("isReturned"); + _itemId = rset.getInt("itemId"); + _enchantLvl = rset.getInt("enchantLvl"); + final String elemental = rset.getString("elementals"); + if (elemental != null) + { + final String[] elemDef = elemental.split(";"); + for (int i = 0; i < 6; i++) + { + _elementals[i] = Integer.parseInt(elemDef[i]); + } + } + } + + /* + * This constructor used for creating new message. + */ + public Message(int senderId, int receiverId, boolean isCod, String subject, String text, long reqAdena) + { + _messageId = IdManager.getInstance().getNextId(); + _senderId = senderId; + _receiverId = receiverId; + _subject = subject; + _content = text; + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); + _hasAttachments = false; + _unread = true; + _deletedBySender = false; + _deletedByReceiver = false; + _reqAdena = reqAdena; + _messageType = MailType.REGULAR; + } + + /* + * This constructor used for System Mails + */ + public Message(int receiverId, String subject, String content, MailType sendBySystem) + { + _messageId = IdManager.getInstance().getNextId(); + _senderId = -1; + _receiverId = receiverId; + _subject = subject; + _content = content; + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); + _reqAdena = 0; + _hasAttachments = false; + _unread = true; + _deletedBySender = true; + _deletedByReceiver = false; + _messageType = sendBySystem; + _returned = false; + } + + /* + * This constructor is used for creating new System message + */ + public Message(int senderId, int receiverId, String subject, String content, MailType sendBySystem) + { + _messageId = IdManager.getInstance().getNextId(); + _senderId = senderId; + _receiverId = receiverId; + _subject = subject; + _content = content; + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); + _hasAttachments = false; + _unread = true; + _deletedBySender = true; + _deletedByReceiver = false; + _reqAdena = 0; + _messageType = sendBySystem; + } + + /* + * This constructor used for auto-generation of the "return attachments" message + */ + public Message(Message msg) + { + _messageId = IdManager.getInstance().getNextId(); + _senderId = msg.getSenderId(); + _receiverId = msg.getSenderId(); + _subject = ""; + _content = ""; + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); + _unread = true; + _deletedBySender = true; + _deletedByReceiver = false; + _messageType = MailType.REGULAR; + _returned = true; + _reqAdena = 0; + _hasAttachments = true; + _attachments = msg.getAttachments(); + msg.removeAttachments(); + _attachments.setNewMessageId(_messageId); + } + + public Message(int receiverId, ItemInstance item, MailType mailType) + { + _messageId = IdManager.getInstance().getNextId(); + _senderId = -1; + _receiverId = receiverId; + _subject = ""; + _content = item.getName(); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); + _unread = true; + _deletedBySender = true; + _messageType = mailType; + _returned = false; + _reqAdena = 0; + if (mailType == MailType.COMMISSION_ITEM_SOLD) + { + _hasAttachments = false; + _itemId = item.getId(); + _enchantLvl = item.getEnchantLevel(); + if (item.isArmor()) + { + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elementals[type.getClientId()] = item.getDefenceAttribute(type); + } + } + else if (item.isWeapon() && (item.getAttackAttributeType() != AttributeType.NONE)) + { + _elementals[item.getAttackAttributeType().getClientId()] = item.getAttackAttributePower(); + } + } + else if (mailType == MailType.COMMISSION_ITEM_RETURNED) + { + final Mail attachement = createAttachments(); + attachement.addItem("CommissionReturnItem", item, null, null); + } + } + + public static PreparedStatement getStatement(Message msg, Connection con) throws SQLException + { + final PreparedStatement stmt = con.prepareStatement("INSERT INTO messages (messageId, senderId, receiverId, subject, content, expiration, reqAdena, hasAttachments, isUnread, isDeletedBySender, isDeletedByReceiver, sendBySystem, isReturned, itemId, enchantLvl, elementals) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + stmt.setInt(1, msg._messageId); + stmt.setInt(2, msg._senderId); + stmt.setInt(3, msg._receiverId); + stmt.setString(4, msg._subject); + stmt.setString(5, msg._content); + stmt.setLong(6, msg._expiration); + stmt.setLong(7, msg._reqAdena); + stmt.setString(8, String.valueOf(msg._hasAttachments)); + stmt.setString(9, String.valueOf(msg._unread)); + stmt.setString(10, String.valueOf(msg._deletedBySender)); + stmt.setString(11, String.valueOf(msg._deletedByReceiver)); + stmt.setInt(12, msg._messageType.ordinal()); + stmt.setString(13, String.valueOf(msg._returned)); + stmt.setInt(14, msg._itemId); + stmt.setInt(15, msg._enchantLvl); + stmt.setString(16, msg._elementals[0] + ";" + msg._elementals[1] + ";" + msg._elementals[2] + ";" + msg._elementals[3] + ";" + msg._elementals[4] + ";" + msg._elementals[5]); + return stmt; + } + + public int getId() + { + return _messageId; + } + + public int getSenderId() + { + return _senderId; + } + + public int getReceiverId() + { + return _receiverId; + } + + public String getSenderName() + { + switch (_messageType) + { + case REGULAR: + { + _senderName = CharNameTable.getInstance().getNameById(_senderId); + break; + } + case PRIME_SHOP_GIFT: // Not in client, tbd + { + break; + } + case NEWS_INFORMER: // Handled by Sysstring in client + case NPC: // Handled by NpcName in client + case BIRTHDAY: // Handled by Sysstring in client + case COMMISSION_ITEM_SOLD: // Handled by Sysstring in client + case COMMISSION_ITEM_RETURNED: // Handled by Sysstring in client + case MENTOR_NPC: // Handled in client + default: + { + break; + } + } + return _senderName; + } + + public String getReceiverName() + { + if (_receiverName == null) + { + _receiverName = CharNameTable.getInstance().getNameById(_receiverId); + if (_receiverName == null) + { + _receiverName = ""; + } + } + return _receiverName; + } + + public String getSubject() + { + return _subject; + } + + public String getContent() + { + return _content; + } + + public boolean isLocked() + { + return _reqAdena > 0; + } + + public long getExpiration() + { + return _expiration; + } + + public int getExpirationSeconds() + { + return (int) (_expiration / 1000); + } + + public boolean isUnread() + { + return _unread; + } + + public void markAsRead() + { + if (_unread) + { + _unread = false; + MailManager.getInstance().markAsReadInDb(_messageId); + } + } + + public boolean isDeletedBySender() + { + return _deletedBySender; + } + + public void setDeletedBySender() + { + if (!_deletedBySender) + { + _deletedBySender = true; + if (_deletedByReceiver) + { + MailManager.getInstance().deleteMessageInDb(_messageId); + } + else + { + MailManager.getInstance().markAsDeletedBySenderInDb(_messageId); + } + } + } + + public boolean isDeletedByReceiver() + { + return _deletedByReceiver; + } + + public void setDeletedByReceiver() + { + if (!_deletedByReceiver) + { + _deletedByReceiver = true; + if (_deletedBySender) + { + MailManager.getInstance().deleteMessageInDb(_messageId); + } + else + { + MailManager.getInstance().markAsDeletedByReceiverInDb(_messageId); + } + } + } + + public MailType getMailType() + { + return _messageType; + } + + public boolean isReturned() + { + return _returned; + } + + public void setReturned(boolean value) + { + _returned = value; + } + + public long getReqAdena() + { + return _reqAdena; + } + + public synchronized Mail getAttachments() + { + if (!_hasAttachments) + { + return null; + } + + if (_attachments == null) + { + _attachments = new Mail(_senderId, _messageId); + _attachments.restore(); + } + + return _attachments; + } + + public boolean hasAttachments() + { + return _hasAttachments; + } + + public int getItemId() + { + return _itemId; + } + + public int getEnchantLvl() + { + return _enchantLvl; + } + + public int[] getElementals() + { + return _elementals; + } + + public synchronized void removeAttachments() + { + if (_attachments != null) + { + _attachments = null; + _hasAttachments = false; + MailManager.getInstance().removeAttachmentsInDb(_messageId); + } + } + + public synchronized Mail createAttachments() + { + if (_hasAttachments || (_attachments != null)) + { + return null; + } + + _attachments = new Mail(_senderId, _messageId); + _hasAttachments = true; + return _attachments; + } + + protected final synchronized void unloadAttachments() + { + if (_attachments != null) + { + _attachments.deleteMe(); + MailManager.getInstance().removeAttachmentsInDb(_messageId); + _attachments = null; + } + } +} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java index 2a32e32d54..5eb90fb4ef 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/SkillLearn.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.base.SocialClass; +import org.l2jmobius.gameserver.enums.SocialClass; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0c17bb36d5..9dcb7a3bca 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -55,7 +55,6 @@ import org.l2jmobius.gameserver.model.actor.instance.ServitorInstance; import org.l2jmobius.gameserver.model.actor.status.AttackableStatus; import org.l2jmobius.gameserver.model.actor.tasks.attackable.CommandChannelTimer; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAggroRangeEnter; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttack; @@ -65,6 +64,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3ebe6eb63a..62f1d1049f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -61,9 +61,6 @@ import org.l2jmobius.gameserver.model.actor.instance.WarehouseInstance; import org.l2jmobius.gameserver.model.actor.stat.NpcStat; import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcCanBeSeen; @@ -80,6 +77,9 @@ import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.residences.ClanHall; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java index 4698bfdcf8..7eacda4aa1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/BlockInstance.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.BlockCheckerEngine; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; @@ -51,7 +51,7 @@ public class BlockInstance extends MonsterInstance // Do not update color while sending old info synchronized (this) { - final BlockCheckerEngine event = holder.getEvent(); + final BlockChecker event = holder.getEvent(); if (_colorEffect == 0x53) { // Change color @@ -137,7 +137,7 @@ public class BlockInstance extends MonsterInstance } } - private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockCheckerEngine eng) + private void increaseTeamPointsAndSend(PlayerInstance player, int team, BlockChecker eng) { eng.increasePlayerPoints(player, team); @@ -149,7 +149,7 @@ public class BlockInstance extends MonsterInstance eng.getHolder().broadCastPacketToTeam(secretPoints); } - private void dropItem(int id, BlockCheckerEngine eng, PlayerInstance player) + private void dropItem(int id, BlockChecker eng, PlayerInstance player) { final ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this); final int x = getX() + Rnd.get(50); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java index b882c183a6..0b025e1f03 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DefenderInstance.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java index 975d847005..d5d0a599f6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.items.Weapon; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.DoorStatusUpdate; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 21141aa0a5..3602d314ee 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.List; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java index 8f645006be..88eeb19128 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortManagerInstance.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.Fort.FortFunction; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.teleporter.TeleportHolder; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index 588e4d6da9..3d16b348a2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import org.l2jmobius.gameserver.data.xml.SkillTreeData; +import org.l2jmobius.gameserver.enums.AcquireSkillType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.FolkStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.base.AcquireSkillType; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 87ede73fe3..b1b8007828 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -83,6 +83,7 @@ import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ClanWarState; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.Faction; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.HtmlActionScope; @@ -124,11 +125,13 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.SellBuffsManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; +import org.l2jmobius.gameserver.instancemanager.events.GameEvent; import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.ContactList; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroList; @@ -176,8 +179,6 @@ import org.l2jmobius.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask; import org.l2jmobius.gameserver.model.actor.tasks.player.WaterTask; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.base.ClassId; -import org.l2jmobius.gameserver.model.base.SubClass; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -186,12 +187,6 @@ import org.l2jmobius.gameserver.model.clan.ClanWar; import org.l2jmobius.gameserver.model.cubic.CubicInstance; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Duel; -import org.l2jmobius.gameserver.model.entity.Fort; -import org.l2jmobius.gameserver.model.entity.GameEvent; -import org.l2jmobius.gameserver.model.entity.Hero; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.eventengine.AbstractEvent; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; @@ -226,6 +221,7 @@ import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; @@ -247,6 +243,7 @@ import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; +import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -256,6 +253,9 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.QuestTimer; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.CommonSkill; @@ -449,7 +449,7 @@ public class PlayerInstance extends Playable private boolean _petItems = false; /** The list of sub-classes this character has. */ - private final Map _subClasses = new ConcurrentHashMap<>(); + private final Map _subClasses = new ConcurrentHashMap<>(); private static final String ORIGINAL_CLASS_VAR = "OriginalClass"; @@ -6590,7 +6590,7 @@ public class PlayerInstance extends Playable // Restore Subclass Data (cannot be done earlier in function) if (restoreSubClassData(player) && (activeClassId != player.getBaseClass())) { - for (SubClass subClass : player.getSubClasses().values()) + for (SubClassHolder subClass : player.getSubClasses().values()) { if (subClass.getClassId() == activeClassId) { @@ -6809,7 +6809,7 @@ public class PlayerInstance extends Playable { while (rset.next()) { - final SubClass subClass = new SubClass(); + final SubClassHolder subClass = new SubClassHolder(); subClass.setClassId(rset.getInt("class_id")); subClass.setDualClassActive(rset.getBoolean("dual_class")); subClass.setVitalityPoints(rset.getInt("vitality_points")); @@ -7123,7 +7123,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(UPDATE_CHAR_SUBCLASS)) { - for (SubClass subClass : getSubClasses().values()) + for (SubClassHolder subClass : getSubClasses().values()) { statement.setLong(1, subClass.getExp()); statement.setLong(2, subClass.getSp()); @@ -9518,7 +9518,7 @@ public class PlayerInstance extends Playable // Note: Never change _classIndex in any method other than setActiveClass(). - final SubClass newClass = new SubClass(); + final SubClassHolder newClass = new SubClassHolder(); newClass.setClassId(classId); newClass.setClassIndex(classIndex); newClass.setVitalityPoints(PlayerStat.MAX_VITALITY_POINTS); @@ -9609,7 +9609,7 @@ public class PlayerInstance extends Playable EventDispatcher.getInstance().notifyEventAsync(new OnPlayerProfessionCancel(this, classId), this); } - final SubClass subClass = getSubClasses().get(classIndex); + final SubClassHolder subClass = getSubClasses().get(classIndex); if (subClass == null) { return false; @@ -9708,7 +9708,7 @@ public class PlayerInstance extends Playable { return false; } - final SubClass subClass = _subClasses.get(_classIndex); + final SubClassHolder subClass = _subClasses.get(_classIndex); if (subClass == null) { return false; @@ -9718,7 +9718,7 @@ public class PlayerInstance extends Playable public boolean hasDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9728,9 +9728,9 @@ public class PlayerInstance extends Playable return false; } - public SubClass getDualClass() + public SubClassHolder getDualClass() { - for (SubClass subClass : _subClasses.values()) + for (SubClassHolder subClass : _subClasses.values()) { if (subClass.isDualClass()) { @@ -9740,7 +9740,7 @@ public class PlayerInstance extends Playable return null; } - public Map getSubClasses() + public Map getSubClasses() { return _subClasses; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index 217fb1c4b0..0607b51090 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.status.SiegeFlagStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siegable; +import org.l2jmobius.gameserver.model.siege.Siegable; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 57b3916e9c..ac089b7e91 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -31,8 +31,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java index 59f438128f..fd5f1052e6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/NpcStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; public class NpcStatus extends CreatureStatus { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java index 0976283d6d..e3b931cdd3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java @@ -21,12 +21,12 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.NpcNameLocalisationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.DuelManager; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 6c305ffe1b..341ed13771 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -16,10 +16,10 @@ */ package org.l2jmobius.gameserver.model.actor.status; +import org.l2jmobius.gameserver.model.Duel; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 782dca3687..f2acbb5d8a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -22,9 +22,9 @@ import java.util.Map; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.ExperienceData; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.base.ClassId; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java deleted file mode 100644 index f98e8c4955..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/AcquireSkillType.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -/** - * Learning skill types. - * @author Zoey76 - */ -public enum AcquireSkillType -{ - CLASS(0), - DUMMY(1), - PLEDGE(2), - SUBPLEDGE(3), - TRANSFORM(4), - TRANSFER(5), - SUBCLASS(6), - COLLECT(7), - DUMMY2(8), - DUMMY3(9), - FISHING(10), - REVELATION(11), // Need proper ID - REVELATION_DUALCLASS(12), // Need proper ID - DUALCLASS(13), // Need proper ID - ALCHEMY(140); - - private final int _id; - - private AcquireSkillType(int id) - { - _id = id; - } - - public int getId() - { - return _id; - } - - public static AcquireSkillType getAcquireSkillType(int id) - { - for (AcquireSkillType type : values()) - { - if (type.getId() == id) - { - return type; - } - } - return null; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassId.java deleted file mode 100644 index fdc2fffa68..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassId.java +++ /dev/null @@ -1,394 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; - -/** - * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.
- * Data: - *
    - *
  • id : The Identifier of the class
    • - *
  • isMage : True if the class is a mage class
    • - *
  • race : The race of this class
    • - *
  • parent : The parent ClassId or null if this class is the root
    • - *
- * @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:33 $ - */ -public enum ClassId implements IIdentifiable -{ - FIGHTER(0, false, Race.HUMAN, null), - - WARRIOR(1, false, Race.HUMAN, FIGHTER), - GLADIATOR(2, false, Race.HUMAN, WARRIOR), - WARLORD(3, false, Race.HUMAN, WARRIOR), - KNIGHT(4, false, Race.HUMAN, FIGHTER), - PALADIN(5, false, Race.HUMAN, KNIGHT), - DARK_AVENGER(6, false, Race.HUMAN, KNIGHT), - ROGUE(7, false, Race.HUMAN, FIGHTER), - TREASURE_HUNTER(8, false, Race.HUMAN, ROGUE), - HAWKEYE(9, false, Race.HUMAN, ROGUE), - - MAGE(10, true, Race.HUMAN, null), - WIZARD(11, true, Race.HUMAN, MAGE), - SORCERER(12, true, Race.HUMAN, WIZARD), - NECROMANCER(13, true, Race.HUMAN, WIZARD), - WARLOCK(14, true, true, Race.HUMAN, WIZARD), - CLERIC(15, true, Race.HUMAN, MAGE), - BISHOP(16, true, Race.HUMAN, CLERIC), - PROPHET(17, true, Race.HUMAN, CLERIC), - - ELVEN_FIGHTER(18, false, Race.ELF, null), - ELVEN_KNIGHT(19, false, Race.ELF, ELVEN_FIGHTER), - TEMPLE_KNIGHT(20, false, Race.ELF, ELVEN_KNIGHT), - SWORDSINGER(21, false, Race.ELF, ELVEN_KNIGHT), - ELVEN_SCOUT(22, false, Race.ELF, ELVEN_FIGHTER), - PLAINS_WALKER(23, false, Race.ELF, ELVEN_SCOUT), - SILVER_RANGER(24, false, Race.ELF, ELVEN_SCOUT), - - ELVEN_MAGE(25, true, Race.ELF, null), - ELVEN_WIZARD(26, true, Race.ELF, ELVEN_MAGE), - SPELLSINGER(27, true, Race.ELF, ELVEN_WIZARD), - ELEMENTAL_SUMMONER(28, true, true, Race.ELF, ELVEN_WIZARD), - ORACLE(29, true, Race.ELF, ELVEN_MAGE), - ELDER(30, true, Race.ELF, ORACLE), - - DARK_FIGHTER(31, false, Race.DARK_ELF, null), - PALUS_KNIGHT(32, false, Race.DARK_ELF, DARK_FIGHTER), - SHILLIEN_KNIGHT(33, false, Race.DARK_ELF, PALUS_KNIGHT), - BLADEDANCER(34, false, Race.DARK_ELF, PALUS_KNIGHT), - ASSASSIN(35, false, Race.DARK_ELF, DARK_FIGHTER), - ABYSS_WALKER(36, false, Race.DARK_ELF, ASSASSIN), - PHANTOM_RANGER(37, false, Race.DARK_ELF, ASSASSIN), - - DARK_MAGE(38, true, Race.DARK_ELF, null), - DARK_WIZARD(39, true, Race.DARK_ELF, DARK_MAGE), - SPELLHOWLER(40, true, Race.DARK_ELF, DARK_WIZARD), - PHANTOM_SUMMONER(41, true, true, Race.DARK_ELF, DARK_WIZARD), - SHILLIEN_ORACLE(42, true, Race.DARK_ELF, DARK_MAGE), - SHILLIEN_ELDER(43, true, Race.DARK_ELF, SHILLIEN_ORACLE), - - ORC_FIGHTER(44, false, Race.ORC, null), - ORC_RAIDER(45, false, Race.ORC, ORC_FIGHTER), - DESTROYER(46, false, Race.ORC, ORC_RAIDER), - ORC_MONK(47, false, Race.ORC, ORC_FIGHTER), - TYRANT(48, false, Race.ORC, ORC_MONK), - - ORC_MAGE(49, true, Race.ORC, null), - ORC_SHAMAN(50, true, Race.ORC, ORC_MAGE), - OVERLORD(51, true, Race.ORC, ORC_SHAMAN), - WARCRYER(52, true, Race.ORC, ORC_SHAMAN), - - DWARVEN_FIGHTER(53, false, Race.DWARF, null), - SCAVENGER(54, false, Race.DWARF, DWARVEN_FIGHTER), - BOUNTY_HUNTER(55, false, Race.DWARF, SCAVENGER), - ARTISAN(56, false, Race.DWARF, DWARVEN_FIGHTER), - WARSMITH(57, false, Race.DWARF, ARTISAN), - - DUELIST(88, false, Race.HUMAN, GLADIATOR), - DREADNOUGHT(89, false, Race.HUMAN, WARLORD), - PHOENIX_KNIGHT(90, false, Race.HUMAN, PALADIN), - HELL_KNIGHT(91, false, Race.HUMAN, DARK_AVENGER), - SAGITTARIUS(92, false, Race.HUMAN, HAWKEYE), - ADVENTURER(93, false, Race.HUMAN, TREASURE_HUNTER), - ARCHMAGE(94, true, Race.HUMAN, SORCERER), - SOULTAKER(95, true, Race.HUMAN, NECROMANCER), - ARCANA_LORD(96, true, true, Race.HUMAN, WARLOCK), - CARDINAL(97, true, Race.HUMAN, BISHOP), - HIEROPHANT(98, true, Race.HUMAN, PROPHET), - - EVA_TEMPLAR(99, false, Race.ELF, TEMPLE_KNIGHT), - SWORD_MUSE(100, false, Race.ELF, SWORDSINGER), - WIND_RIDER(101, false, Race.ELF, PLAINS_WALKER), - MOONLIGHT_SENTINEL(102, false, Race.ELF, SILVER_RANGER), - MYSTIC_MUSE(103, true, Race.ELF, SPELLSINGER), - ELEMENTAL_MASTER(104, true, true, Race.ELF, ELEMENTAL_SUMMONER), - EVA_SAINT(105, true, Race.ELF, ELDER), - - SHILLIEN_TEMPLAR(106, false, Race.DARK_ELF, SHILLIEN_KNIGHT), - SPECTRAL_DANCER(107, false, Race.DARK_ELF, BLADEDANCER), - GHOST_HUNTER(108, false, Race.DARK_ELF, ABYSS_WALKER), - GHOST_SENTINEL(109, false, Race.DARK_ELF, PHANTOM_RANGER), - STORM_SCREAMER(110, true, Race.DARK_ELF, SPELLHOWLER), - SPECTRAL_MASTER(111, true, true, Race.DARK_ELF, PHANTOM_SUMMONER), - SHILLIEN_SAINT(112, true, Race.DARK_ELF, SHILLIEN_ELDER), - - TITAN(113, false, Race.ORC, DESTROYER), - GRAND_KHAVATARI(114, false, Race.ORC, TYRANT), - DOMINATOR(115, true, Race.ORC, OVERLORD), - DOOMCRYER(116, true, Race.ORC, WARCRYER), - - FORTUNE_SEEKER(117, false, Race.DWARF, BOUNTY_HUNTER), - MAESTRO(118, false, Race.DWARF, WARSMITH), - - MALE_SOLDIER(123, false, Race.KAMAEL, null), - FEMALE_SOLDIER(124, false, Race.KAMAEL, null), - TROOPER(125, false, Race.KAMAEL, MALE_SOLDIER), - WARDER(126, false, Race.KAMAEL, FEMALE_SOLDIER), - BERSERKER(127, false, Race.KAMAEL, TROOPER), - MALE_SOULBREAKER(128, false, Race.KAMAEL, TROOPER), - FEMALE_SOULBREAKER(129, false, Race.KAMAEL, WARDER), - ARBALESTER(130, false, Race.KAMAEL, WARDER), - DOOMBRINGER(131, false, Race.KAMAEL, BERSERKER), - MALE_SOUL_HOUND(132, false, Race.KAMAEL, MALE_SOULBREAKER), - FEMALE_SOUL_HOUND(133, false, Race.KAMAEL, FEMALE_SOULBREAKER), - TRICKSTER(134, false, Race.KAMAEL, ARBALESTER), - INSPECTOR(135, false, Race.KAMAEL, WARDER), - JUDICATOR(136, false, Race.KAMAEL, INSPECTOR), - - SIGEL_KNIGHT(139, false, null, null), - TYRR_WARRIOR(140, false, null, null), - OTHELL_ROGUE(141, false, null, null), - YUL_ARCHER(142, false, null, null), - FEOH_WIZARD(143, false, null, null), - ISS_ENCHANTER(144, false, null, null), - WYNN_SUMMONER(145, false, null, null), - AEORE_HEALER(146, false, null, null), - - SIGEL_PHOENIX_KNIGHT(148, false, Race.HUMAN, PHOENIX_KNIGHT), - SIGEL_HELL_KNIGHT(149, false, Race.HUMAN, HELL_KNIGHT), - SIGEL_EVA_TEMPLAR(150, false, Race.ELF, EVA_TEMPLAR), - SIGEL_SHILLIEN_TEMPLAR(151, false, Race.DARK_ELF, SHILLIEN_TEMPLAR), - TYRR_DUELIST(152, false, Race.HUMAN, DUELIST), - TYRR_DREADNOUGHT(153, false, Race.HUMAN, DREADNOUGHT), - TYRR_TITAN(154, false, Race.ORC, TITAN), - TYRR_GRAND_KHAVATARI(155, false, Race.ORC, GRAND_KHAVATARI), - TYRR_MAESTRO(156, false, Race.DWARF, MAESTRO), - TYRR_DOOMBRINGER(157, false, Race.KAMAEL, DOOMBRINGER), - OTHELL_ADVENTURER(158, false, Race.HUMAN, ADVENTURER), - OTHELL_WIND_RIDER(159, false, Race.ELF, WIND_RIDER), - OTHELL_GHOST_HUNTER(160, false, Race.DARK_ELF, GHOST_HUNTER), - OTHELL_FORTUNE_SEEKER(161, false, Race.DWARF, FORTUNE_SEEKER), - YUL_SAGITTARIUS(162, false, Race.HUMAN, SAGITTARIUS), - YUL_MOONLIGHT_SENTINEL(163, false, Race.ELF, MOONLIGHT_SENTINEL), - YUL_GHOST_SENTINEL(164, false, Race.DARK_ELF, GHOST_SENTINEL), - YUL_TRICKSTER(165, false, Race.KAMAEL, TRICKSTER), - FEOH_ARCHMAGE(166, true, Race.HUMAN, ARCHMAGE), - FEOH_SOULTAKER(167, true, Race.HUMAN, SOULTAKER), - FEOH_MYSTIC_MUSE(168, true, Race.ELF, MYSTIC_MUSE), - FEOH_STORM_SCREAMER(169, true, Race.DARK_ELF, STORM_SCREAMER), - FEOH_SOUL_HOUND(170, true, Race.KAMAEL, MALE_SOUL_HOUND), // fix me ? - ISS_HIEROPHANT(171, true, Race.HUMAN, HIEROPHANT), - ISS_SWORD_MUSE(172, false, Race.ELF, SWORD_MUSE), - ISS_SPECTRAL_DANCER(173, false, Race.DARK_ELF, SPECTRAL_DANCER), - ISS_DOMINATOR(174, true, Race.ORC, DOMINATOR), - ISS_DOOMCRYER(175, true, Race.ORC, DOOMCRYER), - WYNN_ARCANA_LORD(176, true, true, Race.HUMAN, ARCANA_LORD), - WYNN_ELEMENTAL_MASTER(177, true, true, Race.ELF, ELEMENTAL_MASTER), - WYNN_SPECTRAL_MASTER(178, true, true, Race.DARK_ELF, SPECTRAL_MASTER), - AEORE_CARDINAL(179, true, Race.HUMAN, CARDINAL), - AEORE_EVA_SAINT(180, true, Race.ELF, EVA_SAINT), - AEORE_SHILLIEN_SAINT(181, true, Race.DARK_ELF, SHILLIEN_SAINT), - - ERTHEIA_FIGHTER(182, false, Race.ERTHEIA, null), - ERTHEIA_WIZARD(183, true, Race.ERTHEIA, null), - - MARAUDER(184, false, Race.ERTHEIA, ERTHEIA_FIGHTER), - CLOUD_BREAKER(185, true, Race.ERTHEIA, ERTHEIA_WIZARD), - - RIPPER(186, false, Race.ERTHEIA, MARAUDER), - STRATOMANCER(187, true, Race.ERTHEIA, CLOUD_BREAKER), - - EVISCERATOR(188, false, Race.ERTHEIA, RIPPER), - SAYHA_SEER(189, true, Race.ERTHEIA, STRATOMANCER); - - /** The Identifier of the Class */ - private final int _id; - - /** True if the class is a mage class */ - private final boolean _isMage; - - /** True if the class is a summoner class */ - private final boolean _isSummoner; - - /** The Race object of the class */ - private final Race _race; - - /** The parent ClassId or null if this class is a root */ - private final ClassId _parent; - - /** List of available Class for next transfer **/ - private final Set _nextClassIds = new HashSet<>(1); - - private static Map _classIdMap = new HashMap<>(ClassId.values().length); - static - { - for (ClassId classId : ClassId.values()) - { - _classIdMap.put(classId.getId(), classId); - } - } - - public static ClassId getClassId(int cId) - { - return _classIdMap.get(cId); - } - - /** - * Class constructor. - * @param pId the class Id. - * @param pIsMage {code true} if the class is mage class. - * @param race the race related to the class. - * @param pParent the parent class Id. - */ - private ClassId(int pId, boolean pIsMage, Race race, ClassId pParent) - { - _id = pId; - _isMage = pIsMage; - _isSummoner = false; - _race = race; - _parent = pParent; - - if (_parent != null) - { - _parent.addNextClassId(this); - } - } - - /** - * Class constructor. - * @param pId the class Id. - * @param pIsMage {code true} if the class is mage class. - * @param pIsSummoner {code true} if the class is summoner class. - * @param race the race related to the class. - * @param pParent the parent class Id. - */ - private ClassId(int pId, boolean pIsMage, boolean pIsSummoner, Race race, ClassId pParent) - { - _id = pId; - _isMage = pIsMage; - _isSummoner = pIsSummoner; - _race = race; - _parent = pParent; - - if (_parent != null) - { - _parent.addNextClassId(this); - } - } - - /** - * Gets the ID of the class. - * @return the ID of the class - */ - @Override - public int getId() - { - return _id; - } - - /** - * @return {code true} if the class is a mage class. - */ - public boolean isMage() - { - return _isMage; - } - - /** - * @return {code true} if the class is a summoner class. - */ - public boolean isSummoner() - { - return _isSummoner; - } - - /** - * @return the Race object of the class. - */ - public Race getRace() - { - return _race; - } - - /** - * @param cid the parent ClassId to check. - * @return {code true} if this Class is a child of the selected ClassId. - */ - public boolean childOf(ClassId cid) - { - if (_parent == null) - { - return false; - } - - if (_parent == cid) - { - return true; - } - - return _parent.childOf(cid); - } - - /** - * @param cid the parent ClassId to check. - * @return {code true} if this Class is equal to the selected ClassId or a child of the selected ClassId. - */ - public boolean equalsOrChildOf(ClassId cid) - { - return (this == cid) || childOf(cid); - } - - /** - * @return the child level of this Class (0=root, 1=child leve 1...) - */ - public int level() - { - if (_parent == null) - { - return 0; - } - - return 1 + _parent.level(); - } - - /** - * @return its parent Class Id - */ - public ClassId getParent() - { - return _parent; - } - - public ClassId getRootClassId() - { - if (_parent != null) - { - return _parent.getRootClassId(); - } - return this; - } - - /** - * @return list of possible class transfer for this class - */ - public Set getNextClassIds() - { - return _nextClassIds; - } - - private final void addNextClassId(ClassId cId) - { - _nextClassIds.add(cId); - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassInfo.java deleted file mode 100644 index f4cfcb60c5..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/ClassInfo.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -import java.util.regex.Matcher; - -/** - * This class will hold the information of the player classes. - * @author Zoey76 - */ -public class ClassInfo -{ - private final ClassId _classId; - private final String _className; - private final ClassId _parentClassId; - - /** - * Constructor for ClassInfo. - * @param classId the class Id. - * @param className the in game class name. - * @param parentClassId the parent class for the given {@code classId}. - */ - public ClassInfo(ClassId classId, String className, ClassId parentClassId) - { - _classId = classId; - _className = className; - _parentClassId = parentClassId; - } - - /** - * @return the class Id. - */ - public ClassId getClassId() - { - return _classId; - } - - /** - * @return the hardcoded in-game class name. - */ - public String getClassName() - { - return _className; - } - - /** - * @return the class client Id. - */ - private int getClassClientId() - { - int classClientId = _classId.getId(); - if ((classClientId >= 0) && (classClientId <= 57)) - { - classClientId += 247; - } - else if ((classClientId >= 88) && (classClientId <= 118)) - { - classClientId += 1071; - } - else if ((classClientId >= 123) && (classClientId <= 136)) - { - classClientId += 1438; - } - else if ((classClientId >= 139) && (classClientId <= 146)) - { - classClientId += 2338; - } - else if ((classClientId >= 148) && (classClientId <= 181)) - { - classClientId += 2884; - } - else if ((classClientId >= 182) && (classClientId <= 189)) - { - classClientId += 3121; - } - return classClientId; - } - - /** - * @return the class client Id formatted to be displayed on a HTML. - */ - public String getClientCode() - { - return "&$" + getClassClientId() + ";"; - } - - /** - * @return the escaped class client Id formatted to be displayed on a HTML. - */ - public String getEscapedClientCode() - { - return Matcher.quoteReplacement(getClientCode()); - } - - /** - * @return the parent class Id. - */ - public ClassId getParentClassId() - { - return _parentClassId; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/PlayerState.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/PlayerState.java deleted file mode 100644 index cb16dd5971..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/PlayerState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -public enum PlayerState -{ - RESTING, - MOVING, - RUNNING, - STANDING, - FLYING, - BEHIND, - FRONT, - CHAOTIC, - OLYMPIAD -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SocialClass.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SocialClass.java deleted file mode 100644 index 3b86db6e1e..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SocialClass.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -/** - * Enumerated for Social Classes. - * @author Zoey76 - */ -public enum SocialClass -{ - VAGABOND, - VASSAL, - APPRENTICE, - HEIR, - KNIGHT, - ELDER, - BARON, - VISCOUNT, - COUNT, - MARQUIS, - DUKE, - GRAND_DUKE, - DISTINGUISHED_KING, - EMPEROR -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java deleted file mode 100644 index 7c18ab192e..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.base; - -import org.l2jmobius.Config; -import org.l2jmobius.gameserver.data.xml.ExperienceData; - -/** - * Character Sub-Class Definition
- * Used to store key information about a character's sub-class. - * @author Tempy - */ -public class SubClass -{ - private static final byte MAX_LEVEL = Config.MAX_SUBCLASS_LEVEL < ExperienceData.getInstance().getMaxLevel() ? Config.MAX_SUBCLASS_LEVEL : (byte) (ExperienceData.getInstance().getMaxLevel() - 1); - - private static final int MAX_VITALITY_POINTS = 140000; - private static final int MIN_VITALITY_POINTS = 0; - - private ClassId _class; - private long _exp = ExperienceData.getInstance().getExpForLevel(Config.BASE_SUBCLASS_LEVEL); - private long _sp = 0; - private byte _level = Config.BASE_SUBCLASS_LEVEL; - private int _classIndex = 1; - private int _vitalityPoints = 0; - private boolean _dualClass = false; - - public SubClass() - { - // Used for specifying ALL attributes of a sub class directly, - // using the preset default values. - } - - public ClassId getClassDefinition() - { - return _class; - } - - public int getClassId() - { - return _class.getId(); - } - - public long getExp() - { - return _exp; - } - - public long getSp() - { - return _sp; - } - - public byte getLevel() - { - return _level; - } - - public int getVitalityPoints() - { - return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS); - } - - public void setVitalityPoints(int value) - { - _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS); - } - - /** - * First Sub-Class is index 1. - * @return int _classIndex - */ - public int getClassIndex() - { - return _classIndex; - } - - public void setClassId(int classId) - { - _class = ClassId.getClassId(classId); - } - - public void setExp(long expValue) - { - if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1))) - { - _exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1; - return; - } - _exp = expValue; - } - - public void setSp(long spValue) - { - _sp = spValue; - } - - public void setClassIndex(int classIndex) - { - _classIndex = classIndex; - } - - public boolean isDualClass() - { - return _dualClass; - } - - public void setDualClassActive(boolean dualClass) - { - _dualClass = dualClass; - } - - public void setLevel(byte levelValue) - { - if (!_dualClass && (levelValue > MAX_LEVEL)) - { - _level = MAX_LEVEL; - return; - } - else if (levelValue < Config.BASE_SUBCLASS_LEVEL) - { - _level = Config.BASE_SUBCLASS_LEVEL; - return; - } - _level = levelValue; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index f27bfd1912..df4177e12b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 3466416f97..8fc4eaaad2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index cba6999dc2..17a8de9fd3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.entity.Siege; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 6b4fb92953..cee0537b63 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 7f5b51a8f9..07282525cd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 81a9539d78..c5cad7593a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index c020f982f3..6a9ce6b0e4 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.conditions; +import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.base.PlayerState; import org.l2jmobius.gameserver.model.items.Item; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2e67022ea7..3233eacd28 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.entity.Castle; -import org.l2jmobius.gameserver.model.entity.Fort; import org.l2jmobius.gameserver.model.items.Item; +import org.l2jmobius.gameserver.model.siege.Castle; +import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java deleted file mode 100644 index 60e691a19c..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ /dev/null @@ -1,762 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledFuture; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.SpawnTable; -import org.l2jmobius.gameserver.data.xml.NpcData; -import org.l2jmobius.gameserver.data.xml.SkillData; -import org.l2jmobius.gameserver.enums.Team; -import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; -import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; -import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.actor.instance.BlockInstance; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.zone.ZoneId; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; -import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; -import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; -import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameCloseUI; -import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameEnd; -import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; -import org.l2jmobius.gameserver.network.serverpackets.RelationChanged; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; - -/** - * @author BiggBoss - */ -public class BlockCheckerEngine -{ - protected static final Logger LOGGER = Logger.getLogger(BlockCheckerEngine.class.getName()); - // The object which holds all basic members info - protected ArenaParticipantsHolder _holder; - // Maps to hold player of each team and his points - protected Map _redTeamPoints = new ConcurrentHashMap<>(); - protected Map _blueTeamPoints = new ConcurrentHashMap<>(); - // The initial points of the event - protected int _redPoints = 15; - protected int _bluePoints = 15; - // Current used arena - protected int _arena = -1; - // All blocks - protected Set _spawns = ConcurrentHashMap.newKeySet(); - // Sets if the red team won the event at the end of this (used for packets) - protected boolean _isRedWinner; - // Time when the event starts. Used on packet sending - protected long _startedTime; - // The needed arena coordinates - // Arena X: team1X, team1Y, team2X, team2Y, ArenaCenterX, ArenaCenterY - protected static final int[][] _arenaCoordinates = - { - // Arena 0 - Team 1 XY, Team 2 XY - CENTER XY - { - -58368, - -62745, - -57751, - -62131, - -58053, - -62417 - }, - // Arena 1 - Team 1 XY, Team 2 XY - CENTER XY - { - -58350, - -63853, - -57756, - -63266, - -58053, - -63551 - }, - // Arena 2 - Team 1 XY, Team 2 XY - CENTER XY - { - -57194, - -63861, - -56580, - -63249, - -56886, - -63551 - }, - // Arena 3 - Team 1 XY, Team 2 XY - CENTER XY - { - -57200, - -62727, - -56584, - -62115, - -56850, - -62391 - } - }; - // Common z coordinate - private static final int Z_COORD = -2405; - // List of dropped items in event (for later deletion) - protected Set _drops = ConcurrentHashMap.newKeySet(); - // Default arena - private static final byte DEFAULT_ARENA = -1; - // Event is started - protected boolean _isStarted = false; - // Event end - protected ScheduledFuture _task; - // Preserve from exploit reward by logging out - protected boolean _abnormalEnd = false; - - public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) - { - _holder = holder; - if ((arena > -1) && (arena < 4)) - { - _arena = arena; - } - - for (PlayerInstance player : holder.getRedPlayers()) - { - _redTeamPoints.put(player, 0); - } - for (PlayerInstance player : holder.getBluePlayers()) - { - _blueTeamPoints.put(player, 0); - } - } - - /** - * Updates the player holder before the event starts to synchronize all info - * @param holder - */ - public void updatePlayersOnStart(ArenaParticipantsHolder holder) - { - _holder = holder; - } - - /** - * Returns the current holder object of this object engine - * @return HandysBlockCheckerManager.ArenaParticipantsHolder - */ - public ArenaParticipantsHolder getHolder() - { - return _holder; - } - - /** - * Will return the id of the arena used by this event - * @return false; - */ - public int getArena() - { - return _arena; - } - - /** - * Returns the time when the event started - * @return long - */ - public long getStarterTime() - { - return _startedTime; - } - - /** - * Returns the current red team points - * @return int - */ - public int getRedPoints() - { - synchronized (this) - { - return _redPoints; - } - } - - /** - * Returns the current blue team points - * @return int - */ - public int getBluePoints() - { - synchronized (this) - { - return _bluePoints; - } - } - - /** - * Returns the player points - * @param player - * @param isRed - * @return int - */ - public int getPlayerPoints(PlayerInstance player, boolean isRed) - { - if (!_redTeamPoints.containsKey(player) && !_blueTeamPoints.containsKey(player)) - { - return 0; - } - - if (isRed) - { - return _redTeamPoints.get(player); - } - return _blueTeamPoints.get(player); - } - - /** - * Increases player points for his teams - * @param player - * @param team - */ - public synchronized void increasePlayerPoints(PlayerInstance player, int team) - { - if (player == null) - { - return; - } - - if (team == 0) - { - final int points = _redTeamPoints.get(player) + 1; - _redTeamPoints.put(player, points); - _redPoints++; - _bluePoints--; - } - else - { - final int points = _blueTeamPoints.get(player) + 1; - _blueTeamPoints.put(player, points); - _bluePoints++; - _redPoints--; - } - } - - /** - * Will add a new drop into the list of dropped items - * @param item - */ - public void addNewDrop(ItemInstance item) - { - if (item != null) - { - _drops.add(item); - } - } - - /** - * Will return true if the event is already started - * @return boolean - */ - public boolean isStarted() - { - return _isStarted; - } - - /** - * Will send all packets for the event members with the relation info - * @param plr - */ - protected void broadcastRelationChanged(PlayerInstance plr) - { - for (PlayerInstance p : _holder.getAllPlayers()) - { - p.sendPacket(new RelationChanged(plr, plr.getRelation(p), plr.isAutoAttackable(p))); - } - } - - /** - * Called when a there is an empty team. The event will end. - */ - public void endEventAbnormally() - { - try - { - synchronized (this) - { - _isStarted = false; - if (_task != null) - { - _task.cancel(true); - } - - _abnormalEnd = true; - ThreadPool.execute(new EndEvent()); - } - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Couldnt end Block Checker event at " + _arena, e); - } - } - - /** - * This inner class set ups all player and arena parameters to start the event - */ - public class StartEvent implements Runnable - { - // In event used skills - private final Skill _freeze; - private final Skill _transformationRed; - private final Skill _transformationBlue; - // Common and unparametizer packet - private final ExCubeGameCloseUI _closeUserInterface = ExCubeGameCloseUI.STATIC_PACKET; - - public StartEvent() - { - // Initialize all used skills - _freeze = SkillData.getInstance().getSkill(6034, 1); - _transformationRed = SkillData.getInstance().getSkill(6035, 1); - _transformationBlue = SkillData.getInstance().getSkill(6036, 1); - } - - /** - * Will set up all player parameters and port them to their respective location based on their teams - */ - private void setUpPlayers() - { - // Set current arena as being used - HandysBlockCheckerManager.getInstance().setArenaBeingUsed(_arena); - - // Initialize packets avoiding create a new one per player - _redPoints = _spawns.size() / 2; - _bluePoints = _spawns.size() / 2; - final ExCubeGameChangePoints initialPoints = new ExCubeGameChangePoints(300, _bluePoints, _redPoints); - ExCubeGameExtendedChangePoints clientSetUp; - for (PlayerInstance player : _holder.getAllPlayers()) - { - if (player == null) - { - continue; - } - - // Send the secret client packet set up - final boolean isRed = _holder.getRedPlayers().contains(player); - clientSetUp = new ExCubeGameExtendedChangePoints(300, _bluePoints, _redPoints, isRed, player, 0); - player.sendPacket(clientSetUp); - - player.sendPacket(ActionFailed.STATIC_PACKET); - - // Teleport Player - Array access - // Team 0 * 2 = 0; 0 = 0, 0 + 1 = 1. - // Team 1 * 2 = 2; 2 = 2, 2 + 1 = 3 - final int tc = _holder.getPlayerTeam(player) * 2; - // Get x and y coordinates - final int x = _arenaCoordinates[_arena][tc]; - final int y = _arenaCoordinates[_arena][tc + 1]; - player.teleToLocation(x, y, Z_COORD); - // Set the player team - if (isRed) - { - _redTeamPoints.put(player, 0); - player.setTeam(Team.RED); - } - else - { - _blueTeamPoints.put(player, 0); - player.setTeam(Team.BLUE); - } - player.stopAllEffects(); - final Summon pet = player.getPet(); - if (pet != null) - { - pet.unSummon(player); - } - player.getServitors().values().forEach(s -> s.unSummon(player)); - - // Give the player start up effects - // Freeze - _freeze.applyEffects(player, player); - // Transformation - if (_holder.getPlayerTeam(player) == 0) - { - _transformationRed.applyEffects(player, player); - } - else - { - _transformationBlue.applyEffects(player, player); - } - // Set the current player arena - player.setBlockCheckerArena((byte) _arena); - player.setInsideZone(ZoneId.PVP, true); - // Send needed packets - player.sendPacket(initialPoints); - player.sendPacket(_closeUserInterface); - // ExBasicActionList - player.sendPacket(ExBasicActionList.STATIC_PACKET); - broadcastRelationChanged(player); - } - } - - @Override - public void run() - { - // Wrong arena passed, stop event - if (_arena == -1) - { - LOGGER.severe("Couldnt set up the arena Id for the Block Checker event, cancelling event..."); - return; - } - _isStarted = true; - // Spawn the blocks - ThreadPool.execute(new SpawnRound(16, 1)); - // Start up player parameters - setUpPlayers(); - // Set the started time - _startedTime = System.currentTimeMillis() + 300000; - } - } - - /** - * This class spawns the second round of boxes and schedules the event end - */ - private class SpawnRound implements Runnable - { - int _numOfBoxes; - int _round; - - SpawnRound(int numberOfBoxes, int round) - { - _numOfBoxes = numberOfBoxes; - _round = round; - } - - @Override - public void run() - { - if (!_isStarted) - { - return; - } - - switch (_round) - { - case 1: // Schedule second spawn round - { - _task = ThreadPool.schedule(new SpawnRound(20, 2), 60000); - break; - } - case 2: // Schedule third spawn round - { - _task = ThreadPool.schedule(new SpawnRound(14, 3), 60000); - break; - } - case 3: // Schedule Event End Count Down - { - _task = ThreadPool.schedule(new EndEvent(), 180000); - break; - } - } - // random % 2, if == 0 will spawn a red block - // if != 0, will spawn a blue block - byte random = 2; - // common template - final NpcTemplate template = NpcData.getInstance().getTemplate(18672); - // Spawn blocks - try - { - // Creates 50 new blocks - for (int i = 0; i < _numOfBoxes; i++) - { - final Spawn spawn = new Spawn(template); - spawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), Z_COORD); - spawn.setAmount(1); - spawn.setHeading(1); - spawn.setRespawnDelay(1); - SpawnTable.getInstance().addNewSpawn(spawn, false); - spawn.init(); - final BlockInstance block = (BlockInstance) spawn.getLastSpawn(); - // switch color - block.setRed((random % 2) == 0); - block.disableCoreAI(true); - _spawns.add(spawn); - random++; - } - } - catch (Exception e) - { - LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); - } - - // Spawn the block carrying girl - if ((_round == 1) || (_round == 2)) - { - try - { - final Spawn girlSpawn = new Spawn(18676); - girlSpawn.setXYZ(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400), _arenaCoordinates[_arena][5] + Rnd.get(-400, 400), Z_COORD); - girlSpawn.setAmount(1); - girlSpawn.setHeading(1); - girlSpawn.setRespawnDelay(1); - SpawnTable.getInstance().addNewSpawn(girlSpawn, false); - girlSpawn.init(); - // Schedule his deletion after 9 secs of spawn - ThreadPool.schedule(new CarryingGirlUnspawn(girlSpawn), 9000); - } - catch (Exception e) - { - LOGGER.warning("Couldnt Spawn Block Checker NPCs! Wrong instance type at npc table?"); - LOGGER.warning(getClass().getSimpleName() + ": " + e.getMessage()); - } - } - - _redPoints += _numOfBoxes / 2; - _bluePoints += _numOfBoxes / 2; - - final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); - final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); - _holder.broadCastPacketToTeam(changePoints); - } - } - - private class CarryingGirlUnspawn implements Runnable - { - private final Spawn _spawn; - - protected CarryingGirlUnspawn(Spawn spawn) - { - _spawn = spawn; - } - - @Override - public void run() - { - if (_spawn == null) - { - LOGGER.warning("HBCE: Block Carrying Girl is null"); - return; - } - SpawnTable.getInstance().deleteSpawn(_spawn, false); - _spawn.stopRespawn(); - _spawn.getLastSpawn().deleteMe(); - } - } - - /* - * private class CountDown implements Runnable { - * @Override public void run() { _holder.broadCastPacketToTeam(new SystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.schedule(new EndEvent(), 5000); } } - */ - - /** - * This class erase all event parameters on player and port them back near Handy. Also, unspawn blocks, runs a garbage collector and set as free the used arena - */ - protected class EndEvent implements Runnable - { - // Garbage collector and arena free setter - private void clearMe() - { - HandysBlockCheckerManager.getInstance().clearPaticipantQueueByArenaId(_arena); - _holder.clearPlayers(); - _blueTeamPoints.clear(); - _redTeamPoints.clear(); - HandysBlockCheckerManager.getInstance().setArenaFree(_arena); - - for (Spawn spawn : _spawns) - { - spawn.stopRespawn(); - spawn.getLastSpawn().deleteMe(); - SpawnTable.getInstance().deleteSpawn(spawn, false); - } - _spawns.clear(); - - for (ItemInstance item : _drops) - { - // npe - if (item == null) - { - continue; - } - - // a player has it, it will be deleted later - if (!item.isSpawned() || (item.getOwnerId() != 0)) - { - continue; - } - - item.decayMe(); - } - _drops.clear(); - } - - /** - * Reward players after event. Tie - No Reward - */ - private void rewardPlayers() - { - if (_redPoints == _bluePoints) - { - return; - } - - _isRedWinner = _redPoints > _bluePoints; - if (_isRedWinner) - { - rewardAsWinner(true); - rewardAsLooser(false); - final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); - msg.addString("Red Team"); - _holder.broadCastPacketToTeam(msg); - } - else if (_bluePoints > _redPoints) - { - rewardAsWinner(false); - rewardAsLooser(true); - final SystemMessage msg = new SystemMessage(SystemMessageId.THE_C1_TEAM_HAS_WON); - msg.addString("Blue Team"); - _holder.broadCastPacketToTeam(msg); - } - else - { - rewardAsLooser(true); - rewardAsLooser(false); - } - } - - /** - * Reward the specified team as a winner team 1) Higher score - 8 extra 2) Higher score - 5 extra - * @param isRed - */ - private void rewardAsWinner(boolean isRed) - { - final Map tempPoints = isRed ? _redTeamPoints : _blueTeamPoints; - - // Main give - for (Entry points : tempPoints.entrySet()) - { - if (points.getKey() == null) - { - continue; - } - - if (points.getValue() >= 10) - { - points.getKey().addItem("Block Checker", 13067, 2, points.getKey(), true); - } - else - { - tempPoints.remove(points.getKey()); - } - } - - int first = 0; - int second = 0; - PlayerInstance winner1 = null; - PlayerInstance winner2 = null; - for (Entry entry : tempPoints.entrySet()) - { - final PlayerInstance pc = entry.getKey(); - final int pcPoints = entry.getValue(); - if (pcPoints > first) - { - // Move old data - second = first; - winner2 = winner1; - // Set new data - first = pcPoints; - winner1 = pc; - } - else if (pcPoints > second) - { - second = pcPoints; - winner2 = pc; - } - } - if (winner1 != null) - { - winner1.addItem("Block Checker", 13067, 8, winner1, true); - } - if (winner2 != null) - { - winner2.addItem("Block Checker", 13067, 5, winner2, true); - } - } - - /** - * Will reward the looser team with the predefined rewards Player got >= 10 points: 2 coins Player got < 10 points: 0 coins - * @param isRed - */ - private void rewardAsLooser(boolean isRed) - { - for (Entry entry : (isRed ? _redTeamPoints : _blueTeamPoints).entrySet()) - { - final PlayerInstance player = entry.getKey(); - if ((player != null) && (entry.getValue() >= 10)) - { - player.addItem("Block Checker", 13067, 2, player, true); - } - } - } - - /** - * Teleport players back, give status back and send final packet - */ - private void setPlayersBack() - { - final ExCubeGameEnd end = new ExCubeGameEnd(_isRedWinner); - for (PlayerInstance player : _holder.getAllPlayers()) - { - if (player == null) - { - continue; - } - - player.stopAllEffects(); - // Remove team aura - player.setTeam(Team.NONE); - // Set default arena - player.setBlockCheckerArena(DEFAULT_ARENA); - // Remove the event items - final PlayerInventory inv = player.getInventory(); - if (inv.getItemByItemId(13787) != null) - { - inv.destroyItemByItemId("Handys Block Checker", 13787, inv.getInventoryItemCount(13787, 0), player, player); - } - if (inv.getItemByItemId(13788) != null) - { - inv.destroyItemByItemId("Handys Block Checker", 13788, inv.getInventoryItemCount(13788, 0), player, player); - } - broadcastRelationChanged(player); - // Teleport Back - player.teleToLocation(-57478, -60367, -2370); - player.setInsideZone(ZoneId.PVP, false); - // Send end packet - player.sendPacket(end); - player.broadcastUserInfo(); - } - } - - @Override - public void run() - { - if (!_abnormalEnd) - { - rewardPlayers(); - } - setPlayersBack(); - clearMe(); - _isStarted = false; - _abnormalEnd = false; - } - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java deleted file mode 100644 index 2da8cf9508..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/ClanHall.java +++ /dev/null @@ -1,398 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.time.Duration; -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.data.sql.ClanTable; -import org.l2jmobius.gameserver.enums.ClanHallGrade; -import org.l2jmobius.gameserver.enums.ClanHallType; -import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; -import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; -import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; - -/** - * @author St3eT - */ -public class ClanHall extends AbstractResidence -{ - private static final Logger LOGGER = Logger.getLogger(ClanHall.class.getName()); - - // Static parameters - private final ClanHallGrade _grade; - private final ClanHallType _type; - private final int _minBid; - final int _lease; - private final int _deposit; - private final List _npcs; - private final List _doors; - private final List _teleports; - private final Location _ownerLocation; - private final Location _banishLocation; - // Dynamic parameters - Clan _owner = null; - long _paidUntil = 0; - protected ScheduledFuture _checkPaymentTask = null; - // Other - private static final String INSERT_CLANHALL = "INSERT INTO clanhall (id, ownerId, paidUntil) VALUES (?,?,?)"; - private static final String LOAD_CLANHALL = "SELECT * FROM clanhall WHERE id=?"; - private static final String UPDATE_CLANHALL = "UPDATE clanhall SET ownerId=?,paidUntil=? WHERE id=?"; - - public ClanHall(StatSet params) - { - super(params.getInt("id")); - // Set static parameters - setName(params.getString("name")); - _grade = params.getEnum("grade", ClanHallGrade.class); - _type = params.getEnum("type", ClanHallType.class); - _minBid = params.getInt("minBid"); - _lease = params.getInt("lease"); - _deposit = params.getInt("deposit"); - _npcs = params.getList("npcList", Integer.class); - _doors = params.getList("doorList", DoorInstance.class); - _teleports = params.getList("teleportList", ClanHallTeleportHolder.class); - _ownerLocation = params.getLocation("owner_loc"); - _banishLocation = params.getLocation("banish_loc"); - // Set dynamic parameters (from DB) - load(); - // Init Clan Hall zone and Functions - initResidenceZone(); - initFunctions(); - } - - @Override - protected void load() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement loadStatement = con.prepareStatement(LOAD_CLANHALL); - PreparedStatement insertStatement = con.prepareStatement(INSERT_CLANHALL)) - { - loadStatement.setInt(1, getResidenceId()); - - try (ResultSet rset = loadStatement.executeQuery()) - { - if (rset.next()) - { - setPaidUntil(rset.getLong("paidUntil")); - setOwner(rset.getInt("ownerId")); - } - else - { - insertStatement.setInt(1, getResidenceId()); - insertStatement.setInt(2, 0); // New clanhall should not have owner - insertStatement.setInt(3, 0); // New clanhall should not have paid until - if (insertStatement.execute()) - { - LOGGER.info("Clan Hall " + getName() + " (" + getResidenceId() + ") was sucessfully created."); - } - } - } - } - catch (SQLException e) - { - LOGGER.log(Level.INFO, "Failed loading clan hall", e); - } - } - - public void updateDB() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement statement = con.prepareStatement(UPDATE_CLANHALL)) - { - statement.setInt(1, getOwnerId()); - statement.setLong(2, _paidUntil); - statement.setInt(3, getResidenceId()); - statement.execute(); - } - catch (SQLException e) - { - LOGGER.warning(e.toString()); - } - } - - @Override - protected void initResidenceZone() - { - for (ClanHallZone zone : ZoneManager.getInstance().getAllZones(ClanHallZone.class)) - { - if (zone.getResidenceId() == getResidenceId()) - { - setResidenceZone(zone); - break; - } - } - } - - public int getCostFailDay() - { - final Duration failDay = Duration.between(Instant.ofEpochMilli(_paidUntil), Instant.now()); - return failDay.isNegative() ? 0 : (int) failDay.toDays(); - } - - /** - * Teleport all non-owner players from {@link ClanHallZone} to {@link ClanHall#getBanishLocation()}. - */ - public void banishOthers() - { - getResidenceZone().banishForeigners(getOwnerId()); - } - - /** - * Open or close all {@link DoorInstance} related to this {@link ClanHall}. - * @param open {@code true} means open door, {@code false} means close door - */ - public void openCloseDoors(boolean open) - { - _doors.forEach(door -> door.openCloseMe(open)); - } - - /** - * Gets the grade of clan hall. - * @return grade of this {@link ClanHall} in {@link ClanHallGrade} enum. - */ - public ClanHallGrade getGrade() - { - return _grade; - } - - /** - * Gets all {@link DoorInstance} related to this {@link ClanHall}. - * @return all {@link DoorInstance} related to this {@link ClanHall} - */ - public List getDoors() - { - return _doors; - } - - /** - * Gets all {@link Npc} related to this {@link ClanHall}. - * @return all {@link Npc} related to this {@link ClanHall} - */ - public List getNpcs() - { - return _npcs; - } - - /** - * Gets the {@link ClanHallType} of this {@link ClanHall}. - * @return {@link ClanHallType} of this {@link ClanHall} in {@link ClanHallGrade} enum. - */ - public ClanHallType getType() - { - return _type; - } - - /** - * Gets the {@link Clan} which own this {@link ClanHall}. - * @return {@link Clan} which own this {@link ClanHall} - */ - public Clan getOwner() - { - return _owner; - } - - /** - * Gets the {@link Clan} ID which own this {@link ClanHall}. - * @return the {@link Clan} ID which own this {@link ClanHall} - */ - @Override - public int getOwnerId() - { - final Clan owner = _owner; - return (owner != null) ? owner.getId() : 0; - } - - /** - * Set the owner of clan hall - * @param clanId the Id of the clan - */ - public void setOwner(int clanId) - { - setOwner(ClanTable.getInstance().getClan(clanId)); - } - - /** - * Set the clan as owner of clan hall - * @param clan the Clan object - */ - public void setOwner(Clan clan) - { - if (clan != null) - { - _owner = clan; - clan.setHideoutId(getResidenceId()); - clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - if (_paidUntil == 0) - { - setPaidUntil(Instant.now().plus(Duration.ofDays(7)).toEpochMilli()); - } - - final int failDays = getCostFailDay(); - final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); - } - else - { - if (_owner != null) - { - _owner.setHideoutId(0); - _owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_owner)); - removeFunctions(); - } - _owner = null; - setPaidUntil(0); - if (_checkPaymentTask != null) - { - _checkPaymentTask.cancel(true); - _checkPaymentTask = null; - } - } - updateDB(); - } - - /** - * Gets the due date of clan hall payment - * @return the due date of clan hall payment - */ - public long getPaidUntil() - { - return _paidUntil; - } - - /** - * Set the due date of clan hall payment - * @param paidUntil the due date of clan hall payment - */ - public void setPaidUntil(long paidUntil) - { - _paidUntil = paidUntil; - } - - /** - * Gets the next date of clan hall payment - * @return the next date of clan hall payment - */ - public long getNextPayment() - { - return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; - } - - public Location getOwnerLocation() - { - return _ownerLocation; - } - - public Location getBanishLocation() - { - return _banishLocation; - } - - public List getTeleportList() - { - return _teleports; - } - - public List getTeleportList(int functionLevel) - { - final List result = new ArrayList<>(); - for (ClanHallTeleportHolder holder : _teleports) - { - if (holder.getMinFunctionLevel() <= functionLevel) - { - result.add(holder); - } - } - return result; - } - - public int getMinBid() - { - return _minBid; - } - - public int getLease() - { - return _lease; - } - - public int getDeposit() - { - return _deposit; - } - - class CheckPaymentTask implements Runnable - { - @Override - public void run() - { - if (_owner != null) - { - if (_owner.getWarehouse().getAdena() < _lease) - { - if (getCostFailDay() > 8) - { - _owner.broadcastToOnlineMembers(new SystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED)); - setOwner(null); - } - else - { - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), 24 * 60 * 60 * 1000); // 1 day - final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); - sm.addInt(_lease); - _owner.broadcastToOnlineMembers(sm); - } - } - else - { - _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); - setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); - updateDB(); - } - } - } - } - - @Override - public String toString() - { - return (getClass().getSimpleName() + ":" + getName() + "[" + getResidenceId() + "]"); - } -} \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Couple.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Couple.java deleted file mode 100644 index 54104ff7ab..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Couple.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Calendar; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.instancemanager.IdManager; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; - -/** - * @author evill33t - */ -public class Couple -{ - private static final Logger LOGGER = Logger.getLogger(Couple.class.getName()); - - private int _id = 0; - private int _player1Id = 0; - private int _player2Id = 0; - private boolean _maried = false; - private Calendar _affiancedDate; - private Calendar _weddingDate; - - public Couple(int coupleId) - { - _id = coupleId; - - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM mods_wedding WHERE id = ?")) - { - ps.setInt(1, _id); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - _player1Id = rs.getInt("player1Id"); - _player2Id = rs.getInt("player2Id"); - _maried = rs.getBoolean("married"); - _affiancedDate = Calendar.getInstance(); - _affiancedDate.setTimeInMillis(rs.getLong("affianceDate")); - - _weddingDate = Calendar.getInstance(); - _weddingDate.setTimeInMillis(rs.getLong("weddingDate")); - } - } - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Exception: Couple.load(): " + e.getMessage(), e); - } - } - - public Couple(PlayerInstance player1, PlayerInstance player2) - { - final int _tempPlayer1Id = player1.getObjectId(); - final int _tempPlayer2Id = player2.getObjectId(); - _player1Id = _tempPlayer1Id; - _player2Id = _tempPlayer2Id; - _affiancedDate = Calendar.getInstance(); - _affiancedDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - - _weddingDate = Calendar.getInstance(); - _weddingDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis()); - - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("INSERT INTO mods_wedding (id, player1Id, player2Id, married, affianceDate, weddingDate) VALUES (?, ?, ?, ?, ?, ?)")) - { - _id = IdManager.getInstance().getNextId(); - ps.setInt(1, _id); - ps.setInt(2, _player1Id); - ps.setInt(3, _player2Id); - ps.setBoolean(4, false); - ps.setLong(5, _affiancedDate.getTimeInMillis()); - ps.setLong(6, _weddingDate.getTimeInMillis()); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Could not create couple: " + e.getMessage(), e); - } - } - - public void marry() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("UPDATE mods_wedding set married = ?, weddingDate = ? where id = ?")) - { - ps.setBoolean(1, true); - _weddingDate = Calendar.getInstance(); - ps.setLong(2, _weddingDate.getTimeInMillis()); - ps.setInt(3, _id); - ps.execute(); - _maried = true; - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Could not marry: " + e.getMessage(), e); - } - } - - public void divorce() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("DELETE FROM mods_wedding WHERE id=?")) - { - ps.setInt(1, _id); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Exception: Couple.divorce(): " + e.getMessage(), e); - } - } - - public int getId() - { - return _id; - } - - public int getPlayer1Id() - { - return _player1Id; - } - - public int getPlayer2Id() - { - return _player2Id; - } - - public boolean getMaried() - { - return _maried; - } - - public Calendar getAffiancedDate() - { - return _affiancedDate; - } - - public Calendar getWeddingDate() - { - return _weddingDate; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Fort.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Fort.java deleted file mode 100644 index 4b535778a2..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Fort.java +++ /dev/null @@ -1,1257 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.Config; -import org.l2jmobius.commons.concurrent.ThreadPool; -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.FortUpdater; -import org.l2jmobius.gameserver.FortUpdater.UpdaterType; -import org.l2jmobius.gameserver.data.SpawnTable; -import org.l2jmobius.gameserver.data.sql.ClanTable; -import org.l2jmobius.gameserver.data.xml.DoorData; -import org.l2jmobius.gameserver.data.xml.StaticObjectData; -import org.l2jmobius.gameserver.enums.MountType; -import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.instancemanager.FortManager; -import org.l2jmobius.gameserver.instancemanager.ZoneManager; -import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.instance.DoorInstance; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; -import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.residences.AbstractResidence; -import org.l2jmobius.gameserver.model.zone.type.FortZone; -import org.l2jmobius.gameserver.model.zone.type.SiegeZone; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.PlaySound; -import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; - -public class Fort extends AbstractResidence -{ - protected static final Logger LOGGER = Logger.getLogger(Fort.class.getName()); - - private final List _doors = new ArrayList<>(); - private StaticObjectInstance _flagPole = null; - private FortSiege _siege = null; - private Calendar _siegeDate; - private Calendar _lastOwnedTime; - private SiegeZone _zone; - Clan _fortOwner = null; - private int _fortType = 0; - private int _state = 0; - private int _castleId = 0; - private int _supplyLvL = 0; - private final Map _function = new ConcurrentHashMap<>(); - private final ScheduledFuture[] _FortUpdater = new ScheduledFuture[2]; - - // Spawn Data - private boolean _isSuspiciousMerchantSpawned = false; - private final Set _siegeNpcs = ConcurrentHashMap.newKeySet(); - private final Set _npcCommanders = ConcurrentHashMap.newKeySet(); - private final Set _specialEnvoys = ConcurrentHashMap.newKeySet(); - - private final Map _envoyCastles = new HashMap<>(2); - private final Set _availableCastles = new HashSet<>(1); - - /** Fortress Functions */ - public static final int FUNC_TELEPORT = 1; - public static final int FUNC_RESTORE_HP = 2; - public static final int FUNC_RESTORE_MP = 3; - public static final int FUNC_RESTORE_EXP = 4; - public static final int FUNC_SUPPORT = 5; - - public class FortFunction - { - final int _type; - private int _lvl; - protected int _fee; - protected int _tempFee; - final long _rate; - long _endDate; - protected boolean _inDebt; - public boolean _cwh; - - public FortFunction(int type, int lvl, int lease, int tempLease, long rate, long time, boolean cwh) - { - _type = type; - _lvl = lvl; - _fee = lease; - _tempFee = tempLease; - _rate = rate; - _endDate = time; - initializeTask(cwh); - } - - public int getType() - { - return _type; - } - - public int getLvl() - { - return _lvl; - } - - public int getLease() - { - return _fee; - } - - public long getRate() - { - return _rate; - } - - public long getEndTime() - { - return _endDate; - } - - public void setLvl(int lvl) - { - _lvl = lvl; - } - - public void setLease(int lease) - { - _fee = lease; - } - - public void setEndTime(long time) - { - _endDate = time; - } - - private void initializeTask(boolean cwh) - { - if (_fortOwner == null) - { - return; - } - final long currentTime = System.currentTimeMillis(); - if (_endDate > currentTime) - { - ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); - } - else - { - ThreadPool.schedule(new FunctionTask(cwh), 0); - } - } - - private class FunctionTask implements Runnable - { - public FunctionTask(boolean cwh) - { - _cwh = cwh; - } - - @Override - public void run() - { - try - { - if (_fortOwner == null) - { - return; - } - if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) - { - final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(System.currentTimeMillis() + _rate); - dbSave(); - if (_cwh) - { - _fortOwner.getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null); - } - ThreadPool.schedule(new FunctionTask(true), _rate); - } - else - { - removeFunction(_type); - } - } - catch (Throwable t) - { - // Ignore. - } - } - } - - public void dbSave() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, _type); - ps.setInt(3, _lvl); - ps.setInt(4, _fee); - ps.setLong(5, _rate); - ps.setLong(6, _endDate); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): " + e.getMessage(), e); - } - } - } - - public Fort(int fortId) - { - super(fortId); - load(); - loadFlagPoles(); - if (_fortOwner != null) - { - setVisibleFlag(true); - loadFunctions(); - } - initResidenceZone(); - // initFunctions(); - initNpcs(); // load and spawn npcs (Always spawned) - initSiegeNpcs(); // load suspicious merchants (Despawned 10mins before siege) - // spawnSuspiciousMerchant(); // spawn suspicious merchants - initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege) - spawnNpcCommanders(); // spawn npc Commanders - initSpecialEnvoys(); // envoys from castles (Spawned after fort taken) - if ((_fortOwner != null) && (_state == 0)) - { - spawnSpecialEnvoys(); - } - } - - /** - * Return function with id - * @param type - * @return - */ - public FortFunction getFortFunction(int type) - { - return _function.get(type); - } - - public void endOfSiege(Clan clan) - { - ThreadPool.execute(new endFortressSiege(this, clan)); - } - - /** - * Move non clan members off fort area and to nearest town. - */ - public void banishForeigners() - { - getResidenceZone().banishForeigners(_fortOwner.getId()); - } - - /** - * @param x - * @param y - * @param z - * @return true if object is inside the zone - */ - public boolean checkIfInZone(int x, int y, int z) - { - return getZone().isInsideZone(x, y, z); - } - - public SiegeZone getZone() - { - if (_zone == null) - { - for (SiegeZone zone : ZoneManager.getInstance().getAllZones(SiegeZone.class)) - { - if (zone.getSiegeObjectId() == getResidenceId()) - { - _zone = zone; - break; - } - } - } - return _zone; - } - - @Override - public FortZone getResidenceZone() - { - return (FortZone) super.getResidenceZone(); - } - - /** - * Get the objects distance to this fort - * @param obj - * @return - */ - public double getDistance(WorldObject obj) - { - return getZone().getDistanceToZone(obj); - } - - public void closeDoor(PlayerInstance player, int doorId) - { - openCloseDoor(player, doorId, false); - } - - public void openDoor(PlayerInstance player, int doorId) - { - openCloseDoor(player, doorId, true); - } - - public void openCloseDoor(PlayerInstance player, int doorId, boolean open) - { - if (player.getClan() != _fortOwner) - { - return; - } - - final DoorInstance door = getDoor(doorId); - if (door != null) - { - if (open) - { - door.openMe(); - } - else - { - door.closeMe(); - } - } - } - - // This method is used to begin removing all fort upgrades - public void removeUpgrade() - { - removeDoorUpgrade(); - } - - /** - * This method will set owner for Fort - * @param clan - * @param updateClansReputation - * @return - */ - public boolean setOwner(Clan clan, boolean updateClansReputation) - { - if (clan == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); - return false; - } - - final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED); - sm.addCastleId(getResidenceId()); - getSiege().announceToPlayer(sm); - - final Clan oldowner = _fortOwner; - if ((oldowner != null) && (clan != oldowner)) - { - // Remove points from old owner - updateClansReputation(oldowner, true); - try - { - final PlayerInstance oldleader = oldowner.getLeader().getPlayerInstance(); - if ((oldleader != null) && (oldleader.getMountType() == MountType.WYVERN)) - { - oldleader.dismount(); - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception in setOwner: " + e.getMessage(), e); - } - if (getSiege().isInProgress()) - { - getSiege().updatePlayerSiegeStateFlags(true); - } - removeOwner(true); - } - setFortState(0, 0); // initialize fort state - - // if clan already have castle, don't store him in fortress - if (clan.getCastleId() > 0) - { - getSiege().announceToPlayer(new SystemMessage(SystemMessageId.THE_REBEL_ARMY_RECAPTURED_THE_FORTRESS)); - return false; - } - - // Give points to new owner - if (updateClansReputation) - { - updateClansReputation(clan, false); - } - - spawnSpecialEnvoys(); - // if clan have already fortress, remove it - if (clan.getFortId() > 0) - { - FortManager.getInstance().getFortByOwner(clan).removeOwner(true); - } - - setSupplyLvL(0); - setOwnerClan(clan); - updateOwnerInDB(); // Update in database - saveFortVariables(); - - if (getSiege().isInProgress()) - { - getSiege().endSiege(); - } - - for (PlayerInstance member : clan.getOnlineMembers(0)) - { - giveResidentialSkills(member); - member.sendSkillList(); - } - return true; - } - - public void removeOwner(boolean updateDB) - { - final Clan clan = _fortOwner; - if (clan != null) - { - for (PlayerInstance member : clan.getOnlineMembers(0)) - { - removeResidentialSkills(member); - member.sendSkillList(); - } - clan.setFortId(0); - clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - setOwnerClan(null); - setSupplyLvL(0); - saveFortVariables(); - removeAllFunctions(); - if (updateDB) - { - updateOwnerInDB(); - } - } - } - - public void raiseSupplyLvL() - { - _supplyLvL++; - if (_supplyLvL > Config.FS_MAX_SUPPLY_LEVEL) - { - _supplyLvL = Config.FS_MAX_SUPPLY_LEVEL; - } - } - - public void setSupplyLvL(int value) - { - if (value <= Config.FS_MAX_SUPPLY_LEVEL) - { - _supplyLvL = value; - } - } - - public int getSupplyLvL() - { - return _supplyLvL; - } - - public void saveFortVariables() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("UPDATE fort SET supplyLvL=? WHERE id = ?")) - { - ps.setInt(1, _supplyLvL); - ps.setInt(2, getResidenceId()); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: saveFortVariables(): " + e.getMessage(), e); - } - } - - /** - * Show or hide flag inside flag pole. - * @param value - */ - public void setVisibleFlag(boolean value) - { - final StaticObjectInstance flagPole = _flagPole; - if (flagPole != null) - { - flagPole.setMeshIndex(value ? 1 : 0); - } - } - - /** - * Respawn all doors on fort grounds. - */ - public void resetDoors() - { - for (DoorInstance door : _doors) - { - if (door.isOpen()) - { - door.closeMe(); - } - if (door.isDead()) - { - door.doRevive(); - } - if (door.getCurrentHp() < door.getMaxHp()) - { - door.setCurrentHp(door.getMaxHp()); - } - } - loadDoorUpgrade(); // Check for any upgrade the doors may have - } - - // This method upgrade door - public void upgradeDoor(int doorId, int hp, int pDef, int mDef) - { - final DoorInstance door = getDoor(doorId); - if (door != null) - { - door.setCurrentHp(door.getMaxHp() + hp); - saveDoorUpgrade(doorId, hp, pDef, mDef); - } - } - - // This method loads fort - @Override - protected void load() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM fort WHERE id = ?")) - { - ps.setInt(1, getResidenceId()); - int ownerId = 0; - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - setName(rs.getString("name")); - - _siegeDate = Calendar.getInstance(); - _lastOwnedTime = Calendar.getInstance(); - _siegeDate.setTimeInMillis(rs.getLong("siegeDate")); - _lastOwnedTime.setTimeInMillis(rs.getLong("lastOwnedTime")); - ownerId = rs.getInt("owner"); - _fortType = rs.getInt("fortType"); - _state = rs.getInt("state"); - _castleId = rs.getInt("castleId"); - _supplyLvL = rs.getInt("supplyLvL"); - } - } - if (ownerId > 0) - { - final Clan clan = ClanTable.getInstance().getClan(ownerId); // Try to find clan instance - clan.setFortId(getResidenceId()); - setOwnerClan(clan); - final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); - while (initial > (Config.FS_UPDATE_FRQ * 60000)) - { - initial -= Config.FS_UPDATE_FRQ * 60000; - } - initial = (Config.FS_UPDATE_FRQ * 60000) - initial; - if ((Config.FS_MAX_OWN_TIME <= 0) || (getOwnedTime() < (Config.FS_MAX_OWN_TIME * 3600))) - { - _FortUpdater[0] = ThreadPool.scheduleAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, Config.FS_UPDATE_FRQ * 60000); // Schedule owner tasks to start running - if (Config.FS_MAX_OWN_TIME > 0) - { - _FortUpdater[1] = ThreadPool.scheduleAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener - } - } - else - { - _FortUpdater[1] = ThreadPool.schedule(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 60000); // Schedule owner tasks to remove owner - } - } - else - { - setOwnerClan(null); - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: loadFortData(): " + e.getMessage(), e); - } - } - - /** Load All Functions */ - private void loadFunctions() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM fort_functions WHERE fort_id = ?")) - { - ps.setInt(1, getResidenceId()); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - _function.put(rs.getInt("type"), new FortFunction(rs.getInt("type"), rs.getInt("lvl"), rs.getInt("lease"), 0, rs.getLong("rate"), rs.getLong("endTime"), true)); - } - } - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Exception: Fort.loadFunctions(): " + e.getMessage(), e); - } - } - - /** - * Remove function In List and in DB - * @param functionType - */ - public void removeFunction(int functionType) - { - _function.remove(functionType); - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("DELETE FROM fort_functions WHERE fort_id=? AND type=?")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, functionType); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.SEVERE, "Exception: Fort.removeFunctions(int functionType): " + e.getMessage(), e); - } - } - - /** - * Remove all fort functions. - */ - private void removeAllFunctions() - { - for (int id : _function.keySet()) - { - removeFunction(id); - } - } - - public boolean updateFunctions(PlayerInstance player, int type, int lvl, int lease, long rate, boolean addNew) - { - if (player == null) - { - return false; - } - if ((lease > 0) && !player.destroyItemByItemId("Consume", Inventory.ADENA_ID, lease, null, true)) - { - return false; - } - if (addNew) - { - _function.put(type, new FortFunction(type, lvl, lease, 0, rate, 0, false)); - } - else if ((lvl == 0) && (lease == 0)) - { - removeFunction(type); - } - else if ((lease - _function.get(type).getLease()) > 0) - { - _function.remove(type); - _function.put(type, new FortFunction(type, lvl, lease, 0, rate, -1, false)); - } - else - { - _function.get(type).setLease(lease); - _function.get(type).setLvl(lvl); - _function.get(type).dbSave(); - } - return true; - } - - public void activateInstance() - { - loadDoor(); - } - - // This method loads fort door data from database - private void loadDoor() - { - for (DoorInstance door : DoorData.getInstance().getDoors()) - { - if ((door.getFort() != null) && (door.getFort().getResidenceId() == getResidenceId())) - { - _doors.add(door); - } - } - } - - private void loadFlagPoles() - { - for (StaticObjectInstance obj : StaticObjectData.getInstance().getStaticObjects()) - { - if ((obj.getType() == 3) && obj.getName().startsWith(getName())) - { - _flagPole = obj; - break; - } - } - if (_flagPole == null) - { - throw new NullPointerException("Can't find flagpole for Fort " + this); - } - } - - // This method loads fort door upgrade data from database - private void loadDoorUpgrade() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM fort_doorupgrade WHERE fortId = ?")) - { - ps.setInt(1, getResidenceId()); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - upgradeDoor(rs.getInt("id"), rs.getInt("hp"), rs.getInt("pDef"), rs.getInt("mDef")); - } - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: loadFortDoorUpgrade(): " + e.getMessage(), e); - } - } - - private void removeDoorUpgrade() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("DELETE FROM fort_doorupgrade WHERE fortId = ?")) - { - ps.setInt(1, getResidenceId()); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: removeDoorUpgrade(): " + e.getMessage(), e); - } - } - - private void saveDoorUpgrade(int doorId, int hp, int pDef, int mDef) - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("INSERT INTO fort_doorupgrade (doorId, hp, pDef, mDef) VALUES (?,?,?,?)")) - { - ps.setInt(1, doorId); - ps.setInt(2, hp); - ps.setInt(3, pDef); - ps.setInt(4, mDef); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): " + e.getMessage(), e); - } - } - - private void updateOwnerInDB() - { - final Clan clan = _fortOwner; - int clanId = 0; - if (clan != null) - { - clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); - } - else - { - _lastOwnedTime.setTimeInMillis(0); - } - - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("UPDATE fort SET owner=?,lastOwnedTime=?,state=?,castleId=? WHERE id = ?")) - { - ps.setInt(1, clanId); - ps.setLong(2, _lastOwnedTime.getTimeInMillis()); - ps.setInt(3, 0); - ps.setInt(4, 0); - ps.setInt(5, getResidenceId()); - ps.execute(); - - // Announce to clan members - if (clan != null) - { - clan.setFortId(getResidenceId()); // Set has fort flag for new owner - SystemMessage sm; - sm = new SystemMessage(SystemMessageId.S1_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2); - sm.addString(clan.getName()); - sm.addCastleId(getResidenceId()); - World.getInstance().getPlayers().forEach(p -> p.sendPacket(sm)); - clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan)); - clan.broadcastToOnlineMembers(new PlaySound(1, "Siege_Victory", 0, 0, 0, 0, 0)); - if (_FortUpdater[0] != null) - { - _FortUpdater[0].cancel(false); - } - if (_FortUpdater[1] != null) - { - _FortUpdater[1].cancel(false); - } - _FortUpdater[0] = ThreadPool.scheduleAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), Config.FS_UPDATE_FRQ * 60000, Config.FS_UPDATE_FRQ * 60000); // Schedule owner tasks to start running - if (Config.FS_MAX_OWN_TIME > 0) - { - _FortUpdater[1] = ThreadPool.scheduleAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owner - } - } - else - { - if (_FortUpdater[0] != null) - { - _FortUpdater[0].cancel(false); - } - _FortUpdater[0] = null; - if (_FortUpdater[1] != null) - { - _FortUpdater[1].cancel(false); - } - _FortUpdater[1] = null; - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: updateOwnerInDB(Pledge clan): " + e.getMessage(), e); - } - } - - @Override - public int getOwnerId() - { - final Clan clan = _fortOwner; - return clan != null ? clan.getId() : -1; - } - - public Clan getOwnerClan() - { - return _fortOwner; - } - - public void setOwnerClan(Clan clan) - { - setVisibleFlag(clan != null); - _fortOwner = clan; - } - - public DoorInstance getDoor(int doorId) - { - if (doorId <= 0) - { - return null; - } - - for (DoorInstance door : _doors) - { - if (door.getId() == doorId) - { - return door; - } - } - return null; - } - - public List getDoors() - { - return _doors; - } - - public StaticObjectInstance getFlagPole() - { - return _flagPole; - } - - public FortSiege getSiege() - { - if (_siege == null) - { - synchronized (this) - { - if (_siege == null) - { - _siege = new FortSiege(this); - } - } - } - return _siege; - } - - public Calendar getSiegeDate() - { - return _siegeDate; - } - - public void setSiegeDate(Calendar siegeDate) - { - _siegeDate = siegeDate; - } - - public int getOwnedTime() - { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); - } - - public int getTimeTillRebelArmy() - { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); - } - - public long getTimeTillNextFortUpdate() - { - return _FortUpdater[0] == null ? 0 : _FortUpdater[0].getDelay(TimeUnit.SECONDS); - } - - public void updateClansReputation(Clan owner, boolean removePoints) - { - if (owner != null) - { - if (removePoints) - { - owner.takeReputationScore(Config.LOOSE_FORT_POINTS, true); - } - else - { - owner.addReputationScore(Config.TAKE_FORT_POINTS, true); - } - } - } - - private static class endFortressSiege implements Runnable - { - private final Fort _f; - private final Clan _clan; - - public endFortressSiege(Fort f, Clan clan) - { - _f = f; - _clan = clan; - } - - @Override - public void run() - { - try - { - _f.setOwner(_clan, true); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception in endFortressSiege " + e.getMessage(), e); - } - } - } - - /** - * @return Returns state of fortress.
- * 0 - not decided yet
- * 1 - independent
- * 2 - contracted with castle - */ - public int getFortState() - { - return _state; - } - - /** - * @param state - *
    - *
  • 0 - not decided yet
    • - *
  • 1 - independent
    • - *
  • 2 - contracted with castle
    • - *
- * @param castleId the Id of the contracted castle (0 if no contract with any castle) - */ - public void setFortState(int state, int castleId) - { - _state = state; - _castleId = castleId; - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) - { - ps.setInt(1, _state); - ps.setInt(2, _castleId); - ps.setInt(3, getResidenceId()); - ps.execute(); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception: setFortState(int state, int castleId): " + e.getMessage(), e); - } - } - - /** - * @return the fortress type (0 - small (3 commanders), 1 - big (4 commanders + control room)) - */ - public int getFortType() - { - return _fortType; - } - - /** - * @param npcId the Id of the ambassador NPC - * @return the Id of the castle this ambassador represents - */ - public int getCastleIdByAmbassador(int npcId) - { - return _envoyCastles.get(npcId); - } - - /** - * @param npcId the Id of the ambassador NPC - * @return the castle this ambassador represents - */ - public Castle getCastleByAmbassador(int npcId) - { - return CastleManager.getInstance().getCastleById(getCastleIdByAmbassador(npcId)); - } - - /** - * @return the Id of the castle contracted with this fortress - */ - public int getContractedCastleId() - { - return _castleId; - } - - /** - * @return the castle contracted with this fortress ({@code null} if no contract with any castle) - */ - public Castle getContractedCastle() - { - return CastleManager.getInstance().getCastleById(getContractedCastleId()); - } - - /** - * Check if this is a border fortress (associated with multiple castles). - * @return {@code true} if this is a border fortress (associated with more than one castle), {@code false} otherwise - */ - public boolean isBorderFortress() - { - return _availableCastles.size() > 1; - } - - /** - * @return the amount of barracks in this fortress - */ - public int getFortSize() - { - return _fortType == 0 ? 3 : 5; - } - - public void spawnSuspiciousMerchant() - { - if (_isSuspiciousMerchantSpawned) - { - return; - } - _isSuspiciousMerchantSpawned = true; - for (Spawn spawnDat : _siegeNpcs) - { - spawnDat.doSpawn(); - spawnDat.startRespawn(); - } - } - - public void despawnSuspiciousMerchant() - { - if (!_isSuspiciousMerchantSpawned) - { - return; - } - _isSuspiciousMerchantSpawned = false; - for (Spawn spawnDat : _siegeNpcs) - { - spawnDat.stopRespawn(); - spawnDat.getLastSpawn().deleteMe(); - } - } - - public void spawnNpcCommanders() - { - for (Spawn spawnDat : _npcCommanders) - { - spawnDat.doSpawn(); - spawnDat.startRespawn(); - } - } - - public void despawnNpcCommanders() - { - for (Spawn spawnDat : _npcCommanders) - { - spawnDat.stopRespawn(); - spawnDat.getLastSpawn().deleteMe(); - } - } - - public void spawnSpecialEnvoys() - { - for (Spawn spawnDat : _specialEnvoys) - { - spawnDat.doSpawn(); - spawnDat.startRespawn(); - } - } - - private void initNpcs() - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM fort_spawnlist WHERE fortId = ? AND spawnType = ?")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, 0); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - final Spawn spawnDat = new Spawn(rs.getInt("npcId")); - spawnDat.setAmount(1); - spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z")); - spawnDat.setHeading(rs.getInt("heading")); - spawnDat.setRespawnDelay(60); - SpawnTable.getInstance().addNewSpawn(spawnDat, false); - spawnDat.doSpawn(); - spawnDat.startRespawn(); - } - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcs: Spawn could not be initialized: " + e.getMessage(), e); - } - } - - private void initSiegeNpcs() - { - _siegeNpcs.clear(); - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, 2); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - final Spawn spawnDat = new Spawn(rs.getInt("npcId")); - spawnDat.setAmount(1); - spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z")); - spawnDat.setHeading(rs.getInt("heading")); - spawnDat.setRespawnDelay(60); - _siegeNpcs.add(spawnDat); - } - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSiegeNpcs: Spawn could not be initialized: " + e.getMessage(), e); - } - } - - private void initNpcCommanders() - { - _npcCommanders.clear(); - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, 1); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - final Spawn spawnDat = new Spawn(rs.getInt("npcId")); - spawnDat.setAmount(1); - spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z")); - spawnDat.setHeading(rs.getInt("heading")); - spawnDat.setRespawnDelay(60); - _npcCommanders.add(spawnDat); - } - } - } - catch (Exception e) - { - // problem with initializing spawn, go to next one - LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initNpcCommanders: Spawn could not be initialized: " + e.getMessage(), e); - } - } - - private void initSpecialEnvoys() - { - _specialEnvoys.clear(); - _envoyCastles.clear(); - _availableCastles.clear(); - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading, castleId FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) - { - ps.setInt(1, getResidenceId()); - ps.setInt(2, 3); - try (ResultSet rs = ps.executeQuery()) - { - while (rs.next()) - { - final int castleId = rs.getInt("castleId"); - final int npcId = rs.getInt("npcId"); - final Spawn spawnDat = new Spawn(npcId); - spawnDat.setAmount(1); - spawnDat.setXYZ(rs.getInt("x"), rs.getInt("y"), rs.getInt("z")); - spawnDat.setHeading(rs.getInt("heading")); - spawnDat.setRespawnDelay(60); - _specialEnvoys.add(spawnDat); - _envoyCastles.put(npcId, castleId); - _availableCastles.add(castleId); - } - } - } - catch (Exception e) - { - // problem with initializing spawn, go to next one - LOGGER.log(Level.WARNING, "Fort " + getResidenceId() + " initSpecialEnvoys: Spawn could not be initialized: " + e.getMessage(), e); - } - } - - @Override - protected void initResidenceZone() - { - for (FortZone zone : ZoneManager.getInstance().getAllZones(FortZone.class)) - { - if (zone.getResidenceId() == getResidenceId()) - { - setResidenceZone(zone); - break; - } - } - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/GameEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/GameEvent.java deleted file mode 100644 index b8c0608bd1..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/GameEvent.java +++ /dev/null @@ -1,548 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.Config; -import org.l2jmobius.gameserver.cache.HtmCache; -import org.l2jmobius.gameserver.data.SpawnTable; -import org.l2jmobius.gameserver.data.xml.NpcData; -import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; -import org.l2jmobius.gameserver.model.Spawn; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.holders.PlayerEventHolder; -import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; -import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; - -/** - * @author Nik - * @Since 2011/05/17 21:51:39 - */ -public class GameEvent -{ - protected static final Logger LOGGER = Logger.getLogger(GameEvent.class.getName()); - public static EventState eventState = EventState.OFF; - public static String _eventName = ""; - public static String _eventCreator = ""; - public static String _eventInfo = ""; - public static int _teamsNumber = 0; - public static final Map _teamNames = new ConcurrentHashMap<>(); - public static final Set _registeredPlayers = ConcurrentHashMap.newKeySet(); - public static final Map> _teams = new ConcurrentHashMap<>(); - public static int _npcId = 0; - private static final Map _connectionLossData = new ConcurrentHashMap<>(); - - public enum EventState - { - OFF, // Not running - STANDBY, // Waiting for participants to register - ON // Registration is over and the event has started. - } - - /** - * @param player - * @return The team ID where the player is in, or -1 if player is null or team not found. - */ - public static int getPlayerTeamId(PlayerInstance player) - { - if (player == null) - { - return -1; - } - - for (Entry> team : _teams.entrySet()) - { - if (team.getValue().contains(player)) - { - return team.getKey(); - } - } - - return -1; - } - - public static List getTopNKillers(int n) - { - final Map tmp = new HashMap<>(); - for (Set teamList : _teams.values()) - { - for (PlayerInstance player : teamList) - { - if (player.getEventStatus() == null) - { - continue; - } - tmp.put(player, player.getEventStatus().getKills().size()); - } - } - - sortByValue(tmp); - - // If the map size is less than "n", n will be as much as the map size - if (tmp.size() <= n) - { - return new ArrayList<>(tmp.keySet()); - } - - final List toReturn = new ArrayList<>(tmp.keySet()); - return toReturn.subList(1, n); - } - - public static void showEventHtml(PlayerInstance player, String objectid) - { - // TODO: work on this - if (eventState == EventState.STANDBY) - { - try - { - final String htmContent; - final NpcHtmlMessage html = new NpcHtmlMessage(Integer.parseInt(objectid)); - if (_registeredPlayers.contains(player)) - { - htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participating.htm"); - } - else - { - htmContent = HtmCache.getInstance().getHtm(player, "data/html/mods/EventEngine/Participation.htm"); - } - - if (htmContent != null) - { - html.setHtml(htmContent); - } - - html.replace("%objectId%", objectid); // Yeah, we need this. - html.replace("%eventName%", _eventName); - html.replace("%eventCreator%", _eventCreator); - html.replace("%eventInfo%", _eventInfo); - player.sendPacket(html); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception on showEventHtml(): " + e.getMessage(), e); - } - } - } - - /** - * Spawns an event participation NPC near the player. The npc id used to spawning is GameEvent._npcId - * @param target - */ - public static void spawnEventNpc(PlayerInstance target) - { - try - { - final Spawn spawn = new Spawn(_npcId); - spawn.setXYZ(target.getX() + 50, target.getY() + 50, target.getZ()); - spawn.setAmount(1); - spawn.setHeading(target.getHeading()); - spawn.stopRespawn(); - SpawnTable.getInstance().addNewSpawn(spawn, false); - spawn.init(); - spawn.getLastSpawn().setCurrentHp(999999999); - spawn.getLastSpawn().setTitle(_eventName); - spawn.getLastSpawn().getVariables().set("eventmob", true); - spawn.getLastSpawn().setInvul(true); - // spawn.getLastSpawn().decayMe(); - // spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ()); - spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1)); - - // _npcs.add(spawn.getLastSpawn()); - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Exception on spawn(): " + e.getMessage(), e); - } - } - - /** - * Zoey76: TODO: Rewrite this in a way that doesn't iterate over all spawns. - */ - public static void unspawnEventNpcs() - { - SpawnTable.getInstance().forEachSpawn(spawn -> - { - final Npc npc = spawn.getLastSpawn(); - if ((npc != null) && npc.getVariables().getBoolean("eventmob", false)) - { - npc.deleteMe(); - spawn.stopRespawn(); - SpawnTable.getInstance().deleteSpawn(spawn, false); - } - return true; - }); - } - - /** - * @param player - * @return False: If player is null, his event status is null or the event state is off. True: if the player is inside the _registeredPlayers list while the event state is STANDBY. If the event state is ON, it will check if the player is inside in one of the teams. - */ - public static boolean isParticipant(PlayerInstance player) - { - if ((player == null) || (player.getEventStatus() == null)) - { - return false; - } - - switch (eventState) - { - case OFF: - { - return false; - } - case STANDBY: - { - return _registeredPlayers.contains(player); - } - case ON: - { - for (Set teamList : _teams.values()) - { - if (teamList.contains(player)) - { - return true; - } - } - } - } - return false; - } - - /** - * Adds the player to the list of participants. If the event state is NOT STANDBY, the player wont be registered. - * @param player - */ - public static void registerPlayer(PlayerInstance player) - { - if (eventState != EventState.STANDBY) - { - player.sendMessage("The registration period for this event is over."); - return; - } - - if ((Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP)) - { - _registeredPlayers.add(player); - } - else - { - player.sendMessage("You have reached the maximum allowed participants per IP."); - } - } - - /** - * Removes the player from the participating players and the teams and restores his init stats before he registered at the event (loc, pvp, pk, title etc) - * @param player - */ - public static void removeAndResetPlayer(PlayerInstance player) - { - try - { - if (isParticipant(player)) - { - if (player.isDead()) - { - player.restoreExp(100.0); - player.doRevive(); - player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp()); - player.setCurrentCp(player.getMaxCp()); - } - - player.decayMe(); - player.spawnMe(player.getX(), player.getY(), player.getZ()); - player.broadcastUserInfo(); - - player.stopTransformation(true); - } - - if (player.getEventStatus() != null) - { - player.getEventStatus().restorePlayerStats(); - } - - player.setEventStatus(null); - - _registeredPlayers.remove(player); - final int teamId = getPlayerTeamId(player); - if (_teams.containsKey(teamId)) - { - _teams.get(teamId).remove(player); - } - } - catch (Exception e) - { - LOGGER.log(Level.WARNING, "Error at unregisterAndResetPlayer in the event:" + e.getMessage(), e); - } - } - - /** - * The player's event status will be saved at _connectionLossData - * @param player - */ - public static void savePlayerEventStatus(PlayerInstance player) - { - _connectionLossData.put(player, player.getEventStatus()); - } - - /** - * If _connectionLossData contains the player, it will restore the player's event status. Also it will remove the player from the _connectionLossData. - * @param player - */ - public static void restorePlayerEventStatus(PlayerInstance player) - { - if (_connectionLossData.containsKey(player)) - { - player.setEventStatus(_connectionLossData.get(player)); - _connectionLossData.remove(player); - } - } - - /** - * If the event is ON or STANDBY, it will not start. Sets the event state to STANDBY and spawns registration NPCs - * @return a string with information if the event participation has been successfully started or not. - */ - public static String startEventParticipation() - { - try - { - switch (eventState) - { - case ON: - { - return "Cannot start event, it is already on."; - } - case STANDBY: - { - return "Cannot start event, it is on standby mode."; - } - case OFF: // Event is off, so no problem turning it on. - { - eventState = EventState.STANDBY; - break; - } - } - - // Register the event at AntiFeedManager and clean it for just in case if the event is already registered. - AntiFeedManager.getInstance().registerEvent(AntiFeedManager.L2EVENT_ID); - AntiFeedManager.getInstance().clear(AntiFeedManager.L2EVENT_ID); - - // Just in case - unspawnEventNpcs(); - _registeredPlayers.clear(); - // _npcs.clear(); - if (NpcData.getInstance().getTemplate(_npcId) == null) - { - return "Cannot start event, invalid npc id."; - } - - try (FileReader fr = new FileReader(Config.DATAPACK_ROOT + "/data/events/" + _eventName); - BufferedReader br = new BufferedReader(fr)) - { - _eventCreator = br.readLine(); - _eventInfo = br.readLine(); - } - - final Set temp = new HashSet<>(); - for (PlayerInstance player : World.getInstance().getPlayers()) - { - if (!player.isOnline()) - { - continue; - } - - if (!temp.contains(player)) - { - spawnEventNpc(player); - temp.add(player); - } - - World.getInstance().forEachVisibleObjectInRange(player, PlayerInstance.class, 1000, temp::add); - } - } - catch (Exception e) - { - LOGGER.warning("Event: " + e.getMessage()); - return "Cannot start event participation, an error has occured."; - } - - return "The event participation has been successfully started."; - } - - /** - * If the event is ON or OFF, it will not start. Sets the event state to ON, creates the teams, adds the registered players ordered by level at the teams and adds a new event status to the players. - * @return a string with information if the event has been successfully started or not. - */ - public static String startEvent() - { - try - { - switch (eventState) - { - case ON: - { - return "Cannot start event, it is already on."; - } - case STANDBY: - { - eventState = EventState.ON; - break; - } - case OFF: // Event is off, so no problem turning it on. - { - return "Cannot start event, it is off. Participation start is required."; - } - } - - // Clean the things we will use, just in case. - unspawnEventNpcs(); - _teams.clear(); - _connectionLossData.clear(); - - // Insert empty lists at _teams. - for (int i = 0; i < _teamsNumber; i++) - { - _teams.put(i + 1, ConcurrentHashMap.newKeySet()); - } - - int i = 0; - while (!_registeredPlayers.isEmpty()) - { - // Get the player with the biggest level - int max = 0; - PlayerInstance biggestLvlPlayer = null; - for (PlayerInstance player : _registeredPlayers) - { - if (player == null) - { - continue; - } - - if (max < player.getLevel()) - { - max = player.getLevel(); - biggestLvlPlayer = player; - } - } - - if (biggestLvlPlayer == null) - { - continue; - } - - _registeredPlayers.remove(biggestLvlPlayer); - _teams.get(i + 1).add(biggestLvlPlayer); - biggestLvlPlayer.setEventStatus(); - i = (i + 1) % _teamsNumber; - } - } - catch (Exception e) - { - LOGGER.warning("Event: " + e.getMessage()); - return "Cannot start event, an error has occured."; - } - - return "The event has been successfully started."; - } - - /** - * If the event state is OFF, it will not finish. Sets the event state to OFF, unregisters and resets the players, unspawns and clers the event NPCs, clears the teams, registered players, connection loss data, sets the teams number to 0, sets the event name to empty. - * @return a string with information if the event has been successfully stopped or not. - */ - public static String finishEvent() - { - switch (eventState) - { - case OFF: - { - return "Cannot finish event, it is already off."; - } - case STANDBY: - { - for (PlayerInstance player : _registeredPlayers) - { - removeAndResetPlayer(player); - } - - unspawnEventNpcs(); - // _npcs.clear(); - _registeredPlayers.clear(); - _teams.clear(); - _connectionLossData.clear(); - _teamsNumber = 0; - _eventName = ""; - eventState = EventState.OFF; - return "The event has been stopped at STANDBY mode, all players unregistered and all event npcs unspawned."; - } - case ON: - { - for (Set teamList : _teams.values()) - { - for (PlayerInstance player : teamList) - { - removeAndResetPlayer(player); - } - } - - eventState = EventState.OFF; - AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID); - unspawnEventNpcs(); // Just in case - // _npcs.clear(); - _registeredPlayers.clear(); - _teams.clear(); - _connectionLossData.clear(); - _teamsNumber = 0; - _eventName = ""; - _npcId = 0; - _eventCreator = ""; - _eventInfo = ""; - return "The event has been stopped, all players unregistered and all event npcs unspawned."; - } - } - - return "The event has been successfully finished."; - } - - private static Map sortByValue(Map unsortMap) - { - final List> list = new LinkedList<>(unsortMap.entrySet()); - list.sort(Comparator.comparing(Entry::getValue)); - - final Map sortedMap = new LinkedHashMap<>(); - for (Entry entry : list) - { - sortedMap.put(entry.getKey(), entry.getValue()); - } - return sortedMap; - } -} diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java deleted file mode 100644 index 5d13146ab0..0000000000 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java +++ /dev/null @@ -1,939 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.entity; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - -import org.l2jmobius.Config; -import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.cache.HtmCache; -import org.l2jmobius.gameserver.data.sql.CharNameTable; -import org.l2jmobius.gameserver.data.sql.ClanTable; -import org.l2jmobius.gameserver.data.xml.ClassListData; -import org.l2jmobius.gameserver.data.xml.NpcData; -import org.l2jmobius.gameserver.instancemanager.CastleManager; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.ItemInstance; -import org.l2jmobius.gameserver.model.olympiad.Olympiad; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; -import org.l2jmobius.gameserver.network.serverpackets.SocialAction; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.network.serverpackets.UserInfo; - -/** - * Hero entity. - * @author godson - */ -public class Hero -{ - private static final Logger LOGGER = Logger.getLogger(Hero.class.getName()); - - private static final String GET_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId AND heroes.played = 1"; - private static final String GET_ALL_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId"; - private static final String UPDATE_ALL = "UPDATE heroes SET played = 0"; - private static final String INSERT_HERO = "INSERT INTO heroes (charId, class_id, count, played, claimed) VALUES (?,?,?,?,?)"; - private static final String UPDATE_HERO = "UPDATE heroes SET count = ?, played = ?, claimed = ? WHERE charId = ?"; - private static final String GET_CLAN_ALLY = "SELECT characters.clanid AS clanid, coalesce(clan_data.ally_Id, 0) AS allyId FROM characters LEFT JOIN clan_data ON clan_data.clan_id = characters.clanid WHERE characters.charId = ?"; - private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (30392, 30393, 30394, 30395, 30396, 30397, 30398, 30399, 30400, 30401, 30402, 30403, 30404, 30405, 30372, 30373, 6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; - - private static final Map HEROES = new ConcurrentHashMap<>(); - private static final Map COMPLETE_HEROS = new ConcurrentHashMap<>(); - private static final Map HERO_COUNTS = new ConcurrentHashMap<>(); - private static final Map> HERO_FIGHTS = new ConcurrentHashMap<>(); - private static final Map> HERO_DIARY = new ConcurrentHashMap<>(); - private static final Map HERO_MESSAGE = new ConcurrentHashMap<>(); - - public static final String COUNT = "count"; - public static final String PLAYED = "played"; - public static final String CLAIMED = "claimed"; - public static final String CLAN_NAME = "clan_name"; - public static final String CLAN_CREST = "clan_crest"; - public static final String ALLY_NAME = "ally_name"; - public static final String ALLY_CREST = "ally_crest"; - - public static final int ACTION_RAID_KILLED = 1; - public static final int ACTION_HERO_GAINED = 2; - public static final int ACTION_CASTLE_TAKEN = 3; - - protected Hero() - { - init(); - } - - private void init() - { - HEROES.clear(); - COMPLETE_HEROS.clear(); - HERO_COUNTS.clear(); - HERO_FIGHTS.clear(); - HERO_DIARY.clear(); - HERO_MESSAGE.clear(); - - try (Connection con = DatabaseFactory.getConnection(); - Statement s1 = con.createStatement(); - ResultSet rset = s1.executeQuery(GET_HEROES); - PreparedStatement ps = con.prepareStatement(GET_CLAN_ALLY); - Statement s2 = con.createStatement(); - ResultSet rset2 = s2.executeQuery(GET_ALL_HEROES)) - { - while (rset.next()) - { - final StatSet hero = new StatSet(); - final int charId = rset.getInt(Olympiad.CHAR_ID); - hero.set(Olympiad.CHAR_NAME, rset.getString(Olympiad.CHAR_NAME)); - hero.set(Olympiad.CLASS_ID, rset.getInt(Olympiad.CLASS_ID)); - hero.set(COUNT, rset.getInt(COUNT)); - hero.set(PLAYED, rset.getInt(PLAYED)); - hero.set(CLAIMED, Boolean.parseBoolean(rset.getString(CLAIMED))); - loadFights(charId); - loadDiary(charId); - loadMessage(charId); - processHeros(ps, charId, hero); - HEROES.put(charId, hero); - } - - while (rset2.next()) - { - final StatSet hero = new StatSet(); - final int charId = rset2.getInt(Olympiad.CHAR_ID); - hero.set(Olympiad.CHAR_NAME, rset2.getString(Olympiad.CHAR_NAME)); - hero.set(Olympiad.CLASS_ID, rset2.getInt(Olympiad.CLASS_ID)); - hero.set(COUNT, rset2.getInt(COUNT)); - hero.set(PLAYED, rset2.getInt(PLAYED)); - hero.set(CLAIMED, Boolean.parseBoolean(rset2.getString(CLAIMED))); - processHeros(ps, charId, hero); - COMPLETE_HEROS.put(charId, hero); - } - } - catch (SQLException e) - { - LOGGER.warning("Hero System: Couldnt load Heroes: " + e.getMessage()); - } - - LOGGER.info("Hero System: Loaded " + HEROES.size() + " Heroes."); - LOGGER.info("Hero System: Loaded " + COMPLETE_HEROS.size() + " all time Heroes."); - } - - private void processHeros(PreparedStatement ps, int charId, StatSet hero) throws SQLException - { - ps.setInt(1, charId); - try (ResultSet rs = ps.executeQuery()) - { - if (rs.next()) - { - final int clanId = rs.getInt("clanid"); - final int allyId = rs.getInt("allyId"); - String clanName = ""; - String allyName = ""; - int clanCrest = 0; - int allyCrest = 0; - if (clanId > 0) - { - clanName = ClanTable.getInstance().getClan(clanId).getName(); - clanCrest = ClanTable.getInstance().getClan(clanId).getCrestId(); - if (allyId > 0) - { - allyName = ClanTable.getInstance().getClan(clanId).getAllyName(); - allyCrest = ClanTable.getInstance().getClan(clanId).getAllyCrestId(); - } - } - hero.set(CLAN_CREST, clanCrest); - hero.set(CLAN_NAME, clanName); - hero.set(ALLY_CREST, allyCrest); - hero.set(ALLY_NAME, allyName); - } - ps.clearParameters(); - } - } - - private String calcFightTime(long fightTimeValue) - { - final String format = String.format("%%0%dd", 2); - final long fightTime = fightTimeValue / 1000; - return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60); - } - - /** - * Restore hero message from Db. - * @param charId - */ - public void loadMessage(int charId) - { - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT message FROM heroes WHERE charId=?")) - { - ps.setInt(1, charId); - try (ResultSet rset = ps.executeQuery()) - { - if (rset.next()) - { - HERO_MESSAGE.put(charId, rset.getString("message")); - } - } - } - catch (SQLException e) - { - LOGGER.warning("Hero System: Couldnt load Hero Message for CharId: " + charId + ": " + e.getMessage()); - } - } - - public void loadDiary(int charId) - { - final List diary = new ArrayList<>(); - int diaryentries = 0; - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM heroes_diary WHERE charId=? ORDER BY time ASC")) - { - ps.setInt(1, charId); - try (ResultSet rset = ps.executeQuery()) - { - while (rset.next()) - { - final StatSet diaryEntry = new StatSet(); - final long time = rset.getLong("time"); - final int action = rset.getInt("action"); - final int param = rset.getInt("param"); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(time)); - diaryEntry.set("date", date); - if (action == ACTION_RAID_KILLED) - { - final NpcTemplate template = NpcData.getInstance().getTemplate(param); - if (template != null) - { - diaryEntry.set("action", template.getName() + " was defeated"); - } - } - else if (action == ACTION_HERO_GAINED) - { - diaryEntry.set("action", "Gained Hero status"); - } - else if (action == ACTION_CASTLE_TAKEN) - { - final Castle castle = CastleManager.getInstance().getCastleById(param); - if (castle != null) - { - diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); - } - } - diary.add(diaryEntry); - diaryentries++; - } - } - HERO_DIARY.put(charId, diary); - - LOGGER.info("Hero System: Loaded " + diaryentries + " diary entries for Hero: " + CharNameTable.getInstance().getNameById(charId)); - } - catch (SQLException e) - { - LOGGER.warning("Hero System: Couldnt load Hero Diary for CharId: " + charId + ": " + e.getMessage()); - } - } - - public void loadFights(int charId) - { - final List fights = new ArrayList<>(); - final StatSet heroCountData = new StatSet(); - final Calendar data = Calendar.getInstance(); - data.set(Calendar.DAY_OF_MONTH, 1); - data.set(Calendar.HOUR_OF_DAY, 0); - data.set(Calendar.MINUTE, 0); - data.set(Calendar.MILLISECOND, 0); - - final long from = data.getTimeInMillis(); - int numberOfFights = 0; - int victories = 0; - int losses = 0; - int draws = 0; - - try (Connection con = DatabaseFactory.getConnection(); - PreparedStatement ps = con.prepareStatement("SELECT * FROM olympiad_fights WHERE (charOneId=? OR charTwoId=?) AND startvictory"); - victories++; - } - else if (winner == 2) - { - fight.set("result", "loss"); - losses++; - } - else if (winner == 0) - { - fight.set("result", "draw"); - draws++; - } - fights.add(fight); - numberOfFights++; - } - } - else if (charId == charTwoId) - { - final String name = CharNameTable.getInstance().getNameById(charOneId); - final String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode(); - if ((name != null) && (cls != null)) - { - final StatSet fight = new StatSet(); - fight.set("oponent", name); - fight.set("oponentclass", cls); - fight.set("time", calcFightTime(time)); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start)); - fight.set("start", date); - fight.set("classed", classed); - if (winner == 1) - { - fight.set("result", "loss"); - losses++; - } - else if (winner == 2) - { - fight.set("result", "victory"); - victories++; - } - else if (winner == 0) - { - fight.set("result", "draw"); - draws++; - } - fights.add(fight); - numberOfFights++; - } - } - } - } - - heroCountData.set("victory", victories); - heroCountData.set("draw", draws); - heroCountData.set("loss", losses); - HERO_COUNTS.put(charId, heroCountData); - HERO_FIGHTS.put(charId, fights); - - LOGGER.info("Hero System: Loaded " + numberOfFights + " fights for Hero: " + CharNameTable.getInstance().getNameById(charId)); - } - catch (SQLException e) - { - LOGGER.warning("Hero System: Couldnt load Hero fights history for CharId: " + charId + ": " + e); - } - } - - public Map getHeroes() - { - return HEROES; - } - - public int getHeroByClass(int classid) - { - for (Entry e : HEROES.entrySet()) - { - if (e.getValue().getInt(Olympiad.CLASS_ID) == classid) - { - return e.getKey(); - } - } - return 0; - } - - public void resetData() - { - HERO_DIARY.clear(); - HERO_FIGHTS.clear(); - HERO_COUNTS.clear(); - HERO_MESSAGE.clear(); - } - - public void showHeroDiary(PlayerInstance player, int heroclass, int charid, int page) - { - final int perpage = 10; - final List mainList = HERO_DIARY.get(charid); - if (mainList != null) - { - final NpcHtmlMessage diaryReply = new NpcHtmlMessage(); - final String htmContent = HtmCache.getInstance().getHtm(player, "data/html/olympiad/herodiary.htm"); - final String heroMessage = HERO_MESSAGE.get(charid); - if ((htmContent != null) && (heroMessage != null)) - { - diaryReply.setHtml(htmContent); - diaryReply.replace("%heroname%", CharNameTable.getInstance().getNameById(charid)); - diaryReply.replace("%message%", heroMessage); - diaryReply.disableValidation(); - - if (!mainList.isEmpty()) - { - final List list = new ArrayList<>(mainList); - Collections.reverse(list); - - boolean color = true; - final StringBuilder fList = new StringBuilder(500); - int counter = 0; - int breakat = 0; - for (int i = (page - 1) * perpage; i < list.size(); i++) - { - breakat = i; - final StatSet diaryEntry = list.get(i); - fList.append(""); - if (color) - { - fList.append(""); - } - else - { - fList.append("
"); - } - fList.append(""); - fList.append(""); - fList.append("
" + diaryEntry.getString("date") + ":xx
" + diaryEntry.getString("action") + "
 
"); - fList.append(""); - color = !color; - counter++; - if (counter >= perpage) - { - break; - } - } - - if (breakat < (list.size() - 1)) - { - diaryReply.replace("%buttprev%", "