From 60830994125d8fc73e083fb516809467246dc124 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Jan 2021 23:40:59 +0000 Subject: [PATCH] Backward compatibility changes for Java 8. --- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../network/serverpackets/ExEnterWorld.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 16 ++++++++++++++++ .../HarnakUndergroundRuinsZone.java | 4 ++++ .../data/scripts/ai/bosses/Tiat/Stage1.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../scripts/vehicles/AirShipController.java | 8 ++++++++ .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../network/serverpackets/ExEnterWorld.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../org/l2jmobius/gameserver/model/Potion.java | 10 +++++----- .../org/l2jmobius/gameserver/model/Spawn.java | 2 +- .../gameserver/model/actor/Attackable.java | 4 ++-- .../gameserver/model/actor/Creature.java | 8 ++++---- .../model/actor/instance/PlayerInstance.java | 4 ++-- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../java/org/l2jmobius/util/Rnd.java | 3 +++ .../game/data/scripts/ai/bosses/Antharas.java | 4 ++++ .../Q386_StolenDignity/Q386_StolenDignity.java | 6 +++--- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../l2jmobius/gameserver/TradeController.java | 2 +- .../l2jmobius/gameserver/cache/CrestCache.java | 2 +- .../l2jmobius/gameserver/cache/HtmCache.java | 2 +- .../cache/WarehouseCacheManager.java | 2 +- .../gameserver/data/HeroSkillTable.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 2 +- .../gameserver/data/MobGroupTable.java | 2 +- .../gameserver/data/NobleSkillTable.java | 2 +- .../l2jmobius/gameserver/data/SkillTable.java | 2 +- .../gameserver/data/sql/ClanTable.java | 2 +- .../gameserver/data/sql/HelperBuffTable.java | 2 +- .../gameserver/data/sql/NpcTable.java | 2 +- .../gameserver/data/sql/PetDataTable.java | 2 +- .../data/sql/SkillSpellbookTable.java | 2 +- .../gameserver/data/sql/SkillTreeTable.java | 2 +- .../gameserver/data/sql/SpawnTable.java | 2 +- .../data/sql/TeleportLocationTable.java | 2 +- .../gameserver/data/sql/TradeListTable.java | 2 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/ExperienceData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../gameserver/handler/SkillHandler.java | 2 +- .../gameserver/handler/UserCommandHandler.java | 2 +- .../handler/VoicedCommandHandler.java | 2 +- .../instancemanager/ArenaManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/ClanHallManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/PetitionManager.java | 2 +- .../instancemanager/QuestManager.java | 2 +- .../instancemanager/RebirthManager.java | 2 +- .../instancemanager/SiegeManager.java | 2 +- .../instancemanager/events/PcPoint.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../org/l2jmobius/gameserver/model/World.java | 2 +- .../model/actor/instance/BoatInstance.java | 14 +++++++------- .../model/actor/instance/PlayerInstance.java | 4 ++++ .../gameserver/model/olympiad/Olympiad.java | 2 +- .../model/olympiad/OlympiadManager.java | 2 +- .../partymatching/PartyMatchRoomList.java | 2 +- .../partymatching/PartyMatchWaitingList.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../gameserver/model/residences/ClanHall.java | 4 ++++ .../siege/clanhalls/BanditStrongholdSiege.java | 2 +- .../siege/clanhalls/DevastatedCastle.java | 2 +- .../siege/clanhalls/FortressOfResistance.java | 2 +- .../siege/clanhalls/WildBeastFarmSiege.java | 2 +- .../gameserver/model/spawn/AutoSpawn.java | 2 +- .../gameserver/network/GameClient.java | 2 +- .../clientpackets/RequestRestartPoint.java | 2 +- .../gameserver/script/EventDroplist.java | 2 +- .../taskmanager/DecayTaskManager.java | 2 +- .../gameserver/taskmanager/TaskManager.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../gameserver/util/DocumentSkill.java | 4 ++++ .../game/data/scripts/ai/bosses/Antharas.java | 4 ++++ .../Q386_StolenDignity/Q386_StolenDignity.java | 6 +++--- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../l2jmobius/gameserver/TradeController.java | 2 +- .../l2jmobius/gameserver/cache/CrestCache.java | 2 +- .../l2jmobius/gameserver/cache/HtmCache.java | 2 +- .../cache/WarehouseCacheManager.java | 2 +- .../gameserver/data/HeroSkillTable.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 2 +- .../gameserver/data/MobGroupTable.java | 2 +- .../gameserver/data/NobleSkillTable.java | 2 +- .../l2jmobius/gameserver/data/SkillTable.java | 2 +- .../gameserver/data/sql/ClanTable.java | 2 +- .../gameserver/data/sql/HelperBuffTable.java | 2 +- .../gameserver/data/sql/NpcTable.java | 2 +- .../gameserver/data/sql/PetDataTable.java | 2 +- .../data/sql/SkillSpellbookTable.java | 2 +- .../gameserver/data/sql/SkillTreeTable.java | 2 +- .../gameserver/data/sql/SpawnTable.java | 2 +- .../data/sql/TeleportLocationTable.java | 2 +- .../gameserver/data/sql/TradeListTable.java | 2 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/AugmentationData.java | 2 +- .../gameserver/data/xml/ExperienceData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../gameserver/handler/SkillHandler.java | 2 +- .../gameserver/handler/UserCommandHandler.java | 2 +- .../handler/VoicedCommandHandler.java | 2 +- .../instancemanager/ArenaManager.java | 2 +- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/ClanHallManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/DuelManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/PetitionManager.java | 2 +- .../instancemanager/QuestManager.java | 2 +- .../instancemanager/RebirthManager.java | 2 +- .../instancemanager/SiegeManager.java | 2 +- .../instancemanager/events/PcPoint.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../org/l2jmobius/gameserver/model/World.java | 2 +- .../model/actor/instance/BoatInstance.java | 14 +++++++------- .../model/actor/instance/PlayerInstance.java | 4 ++++ .../gameserver/model/olympiad/Olympiad.java | 2 +- .../model/olympiad/OlympiadManager.java | 2 +- .../partymatching/PartyMatchRoomList.java | 2 +- .../partymatching/PartyMatchWaitingList.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../gameserver/model/residences/ClanHall.java | 4 ++++ .../siege/clanhalls/BanditStrongholdSiege.java | 2 +- .../siege/clanhalls/DevastatedCastle.java | 2 +- .../siege/clanhalls/FortressOfResistance.java | 2 +- .../siege/clanhalls/WildBeastFarmSiege.java | 2 +- .../gameserver/model/spawn/AutoSpawn.java | 2 +- .../gameserver/network/GameClient.java | 2 +- .../clientpackets/RequestRestartPoint.java | 2 +- .../gameserver/script/EventDroplist.java | 2 +- .../taskmanager/DecayTaskManager.java | 2 +- .../gameserver/taskmanager/TaskManager.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../gameserver/util/DocumentSkill.java | 4 ++++ .../HallOfSufferingAttack.java | 4 ++++ .../HallOfSufferingDefence.java | 4 ++++ .../HeartInfinityAttack.java | 4 ++++ .../HeartInfinityDefence.java | 4 ++++ .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../Q00311_ExpulsionOfEvilSpirits.java | 6 +++--- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/TerritoryWarManager.java | 4 ++++ .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../gameserver/model/olympiad/Olympiad.java | 2 +- .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../gameserver/util/DocumentSkill.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../HallOfSufferingAttack.java | 4 ++++ .../HallOfSufferingDefence.java | 4 ++++ .../HeartInfinityAttack.java | 4 ++++ .../HeartInfinityDefence.java | 4 ++++ .../ai/bosses/SeerUgoros/SeerUgoros.java | 18 +++++++++++------- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../Q00311_ExpulsionOfEvilSpirits.java | 6 +++--- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/TerritoryWarManager.java | 4 ++++ .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../gameserver/util/DocumentSkill.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../network/serverpackets/ExEnterWorld.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 4 ++-- .../java/org/l2jmobius/commons/util/Rnd.java | 3 +++ .../cache/WarehouseCacheManager.java | 8 ++++++-- .../gameserver/data/BotReportTable.java | 6 +++++- .../instancemanager/HeavenlyRiftManager.java | 2 +- .../actor/instance/FortCommanderInstance.java | 4 ++++ .../actor/instance/SiegeFlagInstance.java | 4 ++++ .../eventengine/EventMethodNotification.java | 3 +++ .../gameserver/model/quest/LongTimeEvent.java | 2 +- .../gameserver/model/quest/QuestTimer.java | 12 ++++++------ .../network/serverpackets/ExEnterWorld.java | 2 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 4 ++-- .../gameserver/util/DocumentItem.java | 4 ++++ .../l2jmobius/gameserver/util/MinionList.java | 2 +- 413 files changed, 1309 insertions(+), 468 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; 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 576eadf4f2..15730da96c 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 @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java index f7ba0009a7..2dd2c9abf7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; 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 576eadf4f2..15730da96c 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 @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java index f7ba0009a7..2dd2c9abf7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; 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 576eadf4f2..15730da96c 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 @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java index f7ba0009a7..2dd2c9abf7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; 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 576eadf4f2..15730da96c 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 @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java index 8f7c339c6d..0e2f9777b7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; 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 576eadf4f2..15730da96c 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 @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java index eb4d3e6c2e..28f600ef20 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java index 8f7c339c6d..0e2f9777b7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java index 2039386d95..1a5fdea15c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java index 8f7c339c6d..0e2f9777b7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java index 065a2d0b7a..6ec8e908f9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java index 8f7c339c6d..0e2f9777b7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java index df648a4837..43a46768c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java @@ -39,7 +39,7 @@ public class ExEnterWorld implements IClientOutgoingPacket _epochInSeconds = (int) now.getEpochSecond(); ZoneRules rules = ZoneId.systemDefault().getRules(); _zoneIdOffsetSeconds = rules.getStandardOffset(now).getTotalSeconds(); - _daylight = (int) rules.getDaylightSavings(now).toSeconds(); + _daylight = (int) (rules.getDaylightSavings(now).toMillis() / 1000); } @Override diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index 88b3ac1267..e66362d6c0 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -170,6 +170,10 @@ public class Parade extends AbstractNpcAI private class Start implements Runnable { + public Start() + { + } + @Override public void run() { @@ -182,6 +186,10 @@ public class Parade extends AbstractNpcAI private class Spawn implements Runnable { + public Spawn() + { + } + @Override public void run() { @@ -212,6 +220,10 @@ public class Parade extends AbstractNpcAI private class Delete implements Runnable { + public Delete() + { + } + @Override public void run() { @@ -243,6 +255,10 @@ public class Parade extends AbstractNpcAI private class Clean implements Runnable { + public Clean() + { + } + @Override public void run() { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 6396cb5fd5..78d40ed132 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -79,6 +79,10 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI private int currentMonitorizedDamage = 0; private int zoneStage = 0; + public zoneInfo() + { + } + void setZoneStage(int a) { zoneStage = a; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index cfbf0553a9..bfce09c000 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -71,6 +71,10 @@ public class Stage1 extends AbstractInstance implements IXmlReader private static class SODSpawn { + public SODSpawn() + { + } + boolean isZone = false; boolean isNeededNextFlag = false; int npcId; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java index b0b029816c..c35e706d8e 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/vehicles/AirShipController.java @@ -47,6 +47,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DecayTask implements Runnable { + public DecayTask() + { + } + @Override public void run() { @@ -59,6 +63,10 @@ public abstract class AirShipController extends AbstractNpcAI private final class DepartTask implements Runnable { + public DepartTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java index 8f7c339c6d..0e2f9777b7 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java index df648a4837..43a46768c9 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java @@ -39,7 +39,7 @@ public class ExEnterWorld implements IClientOutgoingPacket _epochInSeconds = (int) now.getEpochSecond(); ZoneRules rules = ZoneId.systemDefault().getRules(); _zoneIdOffsetSeconds = rules.getStandardOffset(now).getTotalSeconds(); - _daylight = (int) rules.getDaylightSavings(now).toSeconds(); + _daylight = (int) (rules.getDaylightSavings(now).toMillis() / 1000); } @Override diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Potion.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Potion.java index 20439b3227..da3bcf38bb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Potion.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Potion.java @@ -27,12 +27,12 @@ public class Potion extends WorldObject Creature _target; private ScheduledFuture _potionhpRegTask; private ScheduledFuture _potionmpRegTask; - private int _seconds; - private double _effect; - private int _duration; private int _potion; - private final Object _mpLock; - private final Object _hpLock; + protected int _seconds; + protected double _effect; + protected int _duration; + protected final Object _mpLock; + protected final Object _hpLock; public Potion() { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java index 089f177354..0b4c99d1c9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java @@ -33,9 +33,9 @@ public class Spawn private final Npc _template; private int _id; private String _location; + protected int _scheduledCount; private int _maximumCount; private int _currentCount; - private int _scheduledCount; private int _npcid; private int _locx; private int _locy; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index cd446be180..97383e6186 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -43,8 +43,8 @@ public class Attackable extends NpcInstance { // private int _moveRadius; private boolean _active; - private ScheduledFuture _currentAiTask; - private ScheduledFuture _currentAIAttackTask; + protected ScheduledFuture _currentAiTask; + protected ScheduledFuture _currentAIAttackTask; private final Map _aggroList = new HashMap<>(); private Weapon _dummyWeapon; private boolean _sweepActive; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4598cb7390..5705915086 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -57,9 +57,9 @@ public abstract class Creature extends WorldObject private ScheduledFuture _attackTask; private ScheduledFuture _hitTask; private ScheduledFuture _regenTask; - private final Object _mpLock = new Object(); + protected final Object _mpLock = new Object(); private boolean _mpRegenActive; - private final Object _hpLock = new Object(); + protected final Object _hpLock = new Object(); private boolean _hpRegenActive; private int _moveOffset; private float _effectiveSpeed; @@ -67,7 +67,7 @@ public abstract class Creature extends WorldObject private double _xAddition; private double _yAddition; private long _timeToTarget; - private ScheduledFuture _moveTask; + protected ScheduledFuture _moveTask; private String _name; private int _level = 1; private int _maxHp; @@ -1074,7 +1074,7 @@ public abstract class Creature extends WorldObject // } } - private void onAttackTimer() + protected void onAttackTimer() { _attackTask = null; final Creature target = (Creature) _attackTarget; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 37cfa844f1..45f956e73e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -98,7 +98,7 @@ public class PlayerInstance extends Creature private int _pvpKills; private int _pkKills; private int _pvpFlag = 0; - private long _lastPvpTime; + protected long _lastPvpTime; private ScheduledFuture _pvpTask; private int _maxLoad; private int _race; @@ -413,7 +413,7 @@ public class PlayerInstance extends Creature return _pvpFlag; } - private void stopPvPFlag() + protected void stopPvPFlag() { if (_pvpTask != null) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index b4f28915a0..b7eec499e4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -41,9 +41,9 @@ import org.l2jmobius.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Rnd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Rnd.java index b50a9f8138..d63ed4d471 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Rnd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Rnd.java @@ -28,6 +28,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java index 7174c9d95e..d26bd62615 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java @@ -576,6 +576,10 @@ public class Antharas extends Quest // Do spawn Behemoth or Bomber. private class MobsSpawn implements Runnable { + public MobsSpawn() + { + } + @Override public void run() { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java index dfd52f76dc..1370fc76fd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java @@ -64,15 +64,15 @@ public class Q386_StolenDignity extends Quest DROP_CHANCES.put(21114, 23); DROP_CHANCES.put(21116, 25); } - private static final Map BINGOS = new HashMap<>(); + protected static final Map BINGOS = new HashMap<>(); // @formatter:off - private static final int[][] REWARDS_WIN = + protected static final int[][] REWARDS_WIN = { {5529, 10}, {5532, 10}, {5533, 10}, {5534, 10}, {5535, 10}, {5536, 10}, {5537, 10}, {5538, 10}, {5539, 10}, {5541, 10}, {5542, 10}, {5543, 10}, {5544, 10}, {5545, 10}, {5546, 10}, {5547, 10}, {5548, 10}, {8331, 10}, {8341, 10}, {8342, 10}, {8346, 10}, {8349, 10}, {8712, 10}, {8713, 10}, {8714, 10}, {8715, 10}, {8716, 10}, {8717, 10}, {8718, 10}, {8719, 10}, {8720, 10}, {8721, 10}, {8722, 10} }; - private static final int[][] REWARDS_LOSE = + protected static final int[][] REWARDS_LOSE = { {5529, 4}, {5532, 4}, {5533, 4}, {5534, 4}, {5535, 4}, {5536, 4}, {5537, 4}, {5538, 4}, {5539, 4}, {5541, 4}, {5542, 4}, {5543, 4}, {5544, 4}, {5545, 4}, {5546, 4}, {5547, 4}, {5548, 4}, {8331, 4}, {8341, 4}, {8342, 4}, {8346, 4}, {8349, 4}, diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java index 61689aaa7b..887abb22de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/TradeController.java @@ -68,7 +68,7 @@ public class TradeController } } - private TradeController() + protected TradeController() { boolean limitedItem = false; _lists = new HashMap<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/CrestCache.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/CrestCache.java index 96e4e7fc3d..8c086a3458 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/CrestCache.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/CrestCache.java @@ -47,7 +47,7 @@ public class CrestCache private int _loadedFiles; private long _bytesBuffLen; - private CrestCache() + protected CrestCache() { convertOldPedgeFiles(); reload(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/HtmCache.java index 111c40ee48..faf97923c2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/HtmCache.java @@ -39,7 +39,7 @@ public class HtmCache private int _loadedFiles; private long _bytesBuffLen; - private HtmCache() + protected HtmCache() { _cache = new HashMap<>(); reload(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2f29646d79..1c3581f790 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -32,7 +32,7 @@ public class WarehouseCacheManager protected final Map _cachedWh; protected final long _cacheTime; - private WarehouseCacheManager() + protected WarehouseCacheManager() { _cacheTime = Config.WAREHOUSE_CACHE_TIME * 60000; // 60*1000 = 60000 _cachedWh = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java index 7544304f90..f3e424c7da 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java @@ -33,7 +33,7 @@ public class HeroSkillTable }; private static Skill[] HERO_SKILLS; - private HeroSkillTable() + protected HeroSkillTable() { HERO_SKILLS = new Skill[5]; HERO_SKILLS[0] = SkillTable.getInstance().getSkill(395, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java index 1a304cb9fc..175989bf70 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -73,7 +73,7 @@ public class ItemTable _crystalTypes.put("none", Item.CRYSTAL_NONE); } - private ItemTable() + protected ItemTable() { hashFiles("data/stats/items", _itemFiles); _etcItems = new HashMap<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/MobGroupTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/MobGroupTable.java index 49235a5144..b1d3c2fb24 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/MobGroupTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/MobGroupTable.java @@ -32,7 +32,7 @@ public class MobGroupTable public static final int FOLLOW_RANGE = 300; public static final int RANDOM_RANGE = 300; - private MobGroupTable() + protected MobGroupTable() { _groupMap = new HashMap<>(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/NobleSkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/NobleSkillTable.java index 7710ccd187..654fde5d49 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/NobleSkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/NobleSkillTable.java @@ -25,7 +25,7 @@ public class NobleSkillTable { private static Skill[] _nobleSkills; - private NobleSkillTable() + protected NobleSkillTable() { _nobleSkills = new Skill[8]; _nobleSkills[0] = SkillTable.getInstance().getSkill(1323, 1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java index aeac77a9ed..c9fd3fe23c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java @@ -36,7 +36,7 @@ public class SkillTable private final Map _skills = new HashMap<>(); private final boolean _initialized = true; - private SkillTable() + protected SkillTable() { hashFiles("data/stats/skills", _skillFiles); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ae94cda22d..a9f5f9bed8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -56,7 +56,7 @@ public class ClanTable private final Map _clans = new HashMap<>(); - private ClanTable() + protected ClanTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java index 53c7bf3f57..f24089b81c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java @@ -50,7 +50,7 @@ public class HelperBuffTable /** * Create and Load the Newbie Helper Buff list from SQL Table helper_buff_list */ - private HelperBuffTable() + protected HelperBuffTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java index 4f59de308b..d878b17235 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java @@ -49,7 +49,7 @@ public class NpcTable private final Map _npcs = new HashMap<>(); private boolean _initialized = false; - private NpcTable() + protected NpcTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java index 66c831517e..0734e809da 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java @@ -32,7 +32,7 @@ public class PetDataTable private static Map> _petTable = new HashMap<>(); - private PetDataTable() + protected PetDataTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java index ccc7d3232b..30ad09c7c7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java @@ -35,7 +35,7 @@ public class SkillSpellbookTable private static Map skillSpellbooks; - private SkillSpellbookTable() + protected SkillSpellbookTable() { skillSpellbooks = new HashMap<>(); try (Connection con = DatabaseFactory.getConnection()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java index 7ba82754c3..893cb58da7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java @@ -54,7 +54,7 @@ public class SkillTreeTable private final List _pledgeSkillTrees = new ArrayList<>(); private final List _enchantSkillTrees = new ArrayList<>(); - private SkillTreeTable() + protected SkillTreeTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java index 61186999df..d5c7cfb102 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java @@ -44,7 +44,7 @@ public class SpawnTable private int _customSpawnCount; private int _highestId; - private SpawnTable() + protected SpawnTable() { if (!Config.ALT_DEV_NO_SPAWNS) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java index 3499c370e6..ff218e9beb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java @@ -36,7 +36,7 @@ public class TeleportLocationTable private final Map _teleports = new HashMap<>(); - private TeleportLocationTable() + protected TeleportLocationTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index bd22a14643..41f0cb71e3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -59,7 +59,7 @@ public class TradeListTable } } - private TradeListTable() + protected TradeListTable() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 57054358bd..2fb0456e74 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -40,7 +40,7 @@ public class ArmorSetData implements IXmlReader private ArmorSet[] _armorSets; - private ArmorSetData() + protected ArmorSetData() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java index 27fb219a74..cf7166da0b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java @@ -42,7 +42,7 @@ public class ExperienceData private final Map _expTable = new HashMap<>(); - private ExperienceData() + protected ExperienceData() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 9390fc3839..b63e5b4dbd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -64,7 +64,7 @@ public class MultisellData return null; } - private MultisellData() + protected MultisellData() { parseData(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 562f866969..23279c4e39 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -96,7 +96,7 @@ public class AdminCommandHandler private final Map _datatable; - private AdminCommandHandler() + protected AdminCommandHandler() { _datatable = new HashMap<>(); registerAdminCommandHandler(new AdminAdmin()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ItemHandler.java index ad7c235394..6af36f0716 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -79,7 +79,7 @@ public class ItemHandler return _datatable.size(); } - private ItemHandler() + protected ItemHandler() { _datatable = new HashMap<>(); registerItemHandler(new BeastSoulShot()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java index 88ebeee067..ef6dc35a31 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/SkillHandler.java @@ -63,7 +63,7 @@ public class SkillHandler private final Map _datatable; - private SkillHandler() + protected SkillHandler() { _datatable = new HashMap<>(); registerSkillHandler(new BalanceLife()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java index ef5f9e1eb6..98b3f69a21 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java @@ -42,7 +42,7 @@ public class UserCommandHandler private final Map _datatable; - private UserCommandHandler() + protected UserCommandHandler() { _datatable = new HashMap<>(); registerUserCommandHandler(new ChannelDelete()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java index 86eb57baeb..67787186e7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -39,7 +39,7 @@ public class VoicedCommandHandler private final Map _datatable; - private VoicedCommandHandler() + protected VoicedCommandHandler() { _datatable = new HashMap<>(); if (Config.BANKING_SYSTEM_ENABLED) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java index 3d8352275a..77a05d986c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java @@ -26,7 +26,7 @@ public class ArenaManager { private List _arenas; - private ArenaManager() + protected ArenaManager() { } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index ae76b9eba2..1845fd8a55 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -168,7 +168,7 @@ public class CastleManorManager } } - private CastleManorManager() + protected CastleManorManager() { load(); // load data from database init(); // schedule all manor related events diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index c432cbdf6f..363a18d24b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -47,7 +47,7 @@ public class ClanHallManager return _loaded; } - private ClanHallManager() + protected ClanHallManager() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 334dcd0973..2d6c3212e7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -60,7 +60,7 @@ public class DimensionalRiftManager private static final short DIMENSIONAL_FRAGMENT_ITEM_ID = 7079; private static final int MAX_PARTY_PER_AREA = 3; - private DimensionalRiftManager() + protected DimensionalRiftManager() { loadRooms(); loadSpawns(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index b715248e67..eac21ae2f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -44,7 +44,7 @@ public class ItemsOnGroundManager static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); protected List _items = new ArrayList<>(); - private ItemsOnGroundManager() + protected ItemsOnGroundManager() { // If SaveDroppedItem is false, may want to delete all items previously stored to avoid add old items on reactivate if (!Config.SAVE_DROPPED_ITEM) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 94cf65da60..9e7019932d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -215,7 +215,7 @@ public class PetitionManager } } - private PetitionManager() + protected PetitionManager() { _pendingPetitions = new HashMap<>(); _completedPetitions = new HashMap<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java index dfc43b665f..dacffb152c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java @@ -29,7 +29,7 @@ public class QuestManager private static Map _quests = new HashMap<>(); private static int _questCount = 0; - private QuestManager() + protected QuestManager() { } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index 6924177096..06a52f1d79 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -49,7 +49,7 @@ public class RebirthManager private final HashMap _playersRebirthInfo = new HashMap<>(); - private RebirthManager() + protected RebirthManager() { // Do Nothing ^_- } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index b565a2821c..fecdec14fb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -68,7 +68,7 @@ public class SiegeManager private boolean _teleportToSiege = false; private boolean _teleportToSiegeTown = false; - private SiegeManager() + protected SiegeManager() { load(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java index a1beac2c90..d219b54e07 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java @@ -32,7 +32,7 @@ public class PcPoint implements Runnable { Logger LOGGER = Logger.getLogger(PcPoint.class.getName()); - private PcPoint() + protected PcPoint() { LOGGER.info("PcBang point event started."); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 1270ad52f1..41893a34ba 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -52,7 +52,7 @@ public class Lottery protected boolean _isStarted; protected long _enddate; - private Lottery() + protected Lottery() { _number = 1; _prize = Config.ALT_LOTTERY_PRIZE; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/World.java index 3469e7aa9b..6a55e72a68 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/World.java @@ -77,7 +77,7 @@ public class World /** The _world regions. */ private WorldRegion[][] _worldRegions; - private World() + protected World() { initRegions(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java index 69cf5e1a91..1421b4a255 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java @@ -47,11 +47,11 @@ public class BoatInstance extends Creature public VehicleDeparture vd = null; private int lastx = -1; private int lasty = -1; - private int cycle = 0; - private int runstate = 0; - private BoatPathHolder pathA; - private BoatPathHolder pathB; - private boolean needOnVehicleCheckLocation = false; + protected int cycle = 0; + protected int runstate = 0; + protected BoatPathHolder pathA; + protected BoatPathHolder pathB; + protected boolean needOnVehicleCheckLocation = false; private final Set passengers = ConcurrentHashMap.newKeySet(); public BoatInstance(int objectId, CreatureTemplate template) @@ -181,7 +181,7 @@ public class BoatInstance extends Creature ThreadPool.schedule(bc, 300000); } - private void begin() + protected void begin() { if (cycle == 1) { @@ -251,7 +251,7 @@ public class BoatInstance extends Creature } } - private void say(int id) + protected void say(int id) { final Collection knownPlayers = getKnownList().getKnownPlayers().values(); CreatureSay sm; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5d3abcf9f4..07ee9cfabc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -15573,6 +15573,10 @@ public class PlayerInstance extends Playable { private DoorInstance _target = null; + public GatesRequest() + { + } + public void setTarget(DoorInstance door) { _target = door; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 0a3adc0865..4710694275 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -58,7 +58,7 @@ public class Olympiad private static Map NOBLES; private static Map NOBLES_RANK; - private static List HEROS_TO_BE; + protected static List HEROS_TO_BE; private static List _nonClassBasedRegisters; private static Map> _classBasedRegisters; public static List OLY_MANAGERS = new ArrayList<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 8fb9805ab3..48f2ce2ed7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -60,7 +60,7 @@ class OlympiadManager implements Runnable new OlympiadStadium(-114413, -213241, -3331) }; - private OlympiadManager() + protected OlympiadManager() { _olympiadInstances = new HashMap<>(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java index 11ac70e802..ed8bdf3fc8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java @@ -31,7 +31,7 @@ public class PartyMatchRoomList private int _maxid = 1; private final Map _rooms; - private PartyMatchRoomList() + protected PartyMatchRoomList() { _rooms = new HashMap<>(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java index 37619ed8dc..2c20a9b21b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java @@ -28,7 +28,7 @@ public class PartyMatchWaitingList { private final List _members; - private PartyMatchWaitingList() + protected PartyMatchWaitingList() { _members = new ArrayList<>(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 998715fbd3..b19eb67b03 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final NpcInstance _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final NpcInstance _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, NpcInstance npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index ed5132c39c..e137e16048 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -194,6 +194,10 @@ public class ClanHall private class FunctionTask implements Runnable { + public FunctionTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 2f04c78927..5dd98a440f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -60,7 +60,7 @@ public class BanditStrongholdSiege extends ClanHallSiege protected boolean _finalStage = false; protected ScheduledFuture _midTimer; - private BanditStrongholdSiege() + protected BanditStrongholdSiege() { LOGGER.info("SiegeManager of Bandits Stronghold"); final long siegeDate = restoreSiegeDate(35); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java index 51de8c33cc..c8f0aa579f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java @@ -77,7 +77,7 @@ public class DevastatedCastle public long _damage; } - private DevastatedCastle() + protected DevastatedCastle() { if (Config.DEVASTATED_DAY == 1) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java index 863c99bf09..2c52068019 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java @@ -62,7 +62,7 @@ public class FortressOfResistance public long _damage; } - private FortressOfResistance() + protected FortressOfResistance() { if (Config.PARTISAN_DAY == 1) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 36054c9866..b32011c89c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -57,7 +57,7 @@ public class WildBeastFarmSiege extends ClanHallSiege protected boolean _finalStage = false; protected ScheduledFuture _midTimer; - private WildBeastFarmSiege() + protected WildBeastFarmSiege() { LOGGER.info("SiegeManager of Wild Beasts Farm"); final long siegeDate = restoreSiegeDate(63); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java index bc09e35e6d..fb954d326e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java @@ -60,7 +60,7 @@ public class AutoSpawn protected boolean _activeState = true; - private AutoSpawn() + protected AutoSpawn() { _registeredSpawns = new HashMap<>(); _runningSpawns = new HashMap<>(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java index c2f43b381e..fc465aa9f4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java @@ -83,11 +83,11 @@ public class GameClient extends MMOClient> implements private ConnectionState _state; private String _accountName; private SessionKey _sessionId; - private PlayerInstance _player; private ScheduledFuture _cleanupTask = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private int _protocolVersion; + protected PlayerInstance _player; public GameClient(MMOConnection con) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index f4667baeec..61bd9ee56c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RequestRestartPoint extends GameClientPacket { - private static final Logger LOGGER = Logger.getLogger(RequestRestartPoint.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(RequestRestartPoint.class.getName()); protected int _requestedPointType; protected boolean _continuation; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/script/EventDroplist.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/script/EventDroplist.java index 5aeb746e95..c1cb26604b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/script/EventDroplist.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/script/EventDroplist.java @@ -49,7 +49,7 @@ public class EventDroplist /** * Constructor of EventDroplist. */ - private EventDroplist() + protected EventDroplist() { _allNpcDateDrops = new ArrayList<>(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 104afd7a0c..37dc56bc53 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -35,7 +35,7 @@ public class DecayTaskManager protected Map _decayTasks = new ConcurrentHashMap<>(); - private DecayTaskManager() + protected DecayTaskManager() { ThreadPool.scheduleAtFixedRate(new DecayScheduler(), 10000, 5000); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 0402016b7f..22e27f839a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -168,7 +168,7 @@ public class TaskManager } } - private TaskManager() + protected TaskManager() { initializate(); startAllTasks(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 1dc238d88b..c8552dbdea 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java index f5517d8abe..7d89f588a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -45,6 +45,10 @@ public class DocumentItem extends DocumentBase private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + public int id; public Enum type; public StatSet set; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java index e846b2fe83..0d15e488d9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -39,6 +39,10 @@ public class DocumentSkill extends DocumentBase private class DocumentSkillDataHolder { + public DocumentSkillDataHolder() + { + } + public int id; public String name; public StatSet[] sets; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index 7174c9d95e..d26bd62615 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -576,6 +576,10 @@ public class Antharas extends Quest // Do spawn Behemoth or Bomber. private class MobsSpawn implements Runnable { + public MobsSpawn() + { + } + @Override public void run() { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java index dfd52f76dc..1370fc76fd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java @@ -64,15 +64,15 @@ public class Q386_StolenDignity extends Quest DROP_CHANCES.put(21114, 23); DROP_CHANCES.put(21116, 25); } - private static final Map BINGOS = new HashMap<>(); + protected static final Map BINGOS = new HashMap<>(); // @formatter:off - private static final int[][] REWARDS_WIN = + protected static final int[][] REWARDS_WIN = { {5529, 10}, {5532, 10}, {5533, 10}, {5534, 10}, {5535, 10}, {5536, 10}, {5537, 10}, {5538, 10}, {5539, 10}, {5541, 10}, {5542, 10}, {5543, 10}, {5544, 10}, {5545, 10}, {5546, 10}, {5547, 10}, {5548, 10}, {8331, 10}, {8341, 10}, {8342, 10}, {8346, 10}, {8349, 10}, {8712, 10}, {8713, 10}, {8714, 10}, {8715, 10}, {8716, 10}, {8717, 10}, {8718, 10}, {8719, 10}, {8720, 10}, {8721, 10}, {8722, 10} }; - private static final int[][] REWARDS_LOSE = + protected static final int[][] REWARDS_LOSE = { {5529, 4}, {5532, 4}, {5533, 4}, {5534, 4}, {5535, 4}, {5536, 4}, {5537, 4}, {5538, 4}, {5539, 4}, {5541, 4}, {5542, 4}, {5543, 4}, {5544, 4}, {5545, 4}, {5546, 4}, {5547, 4}, {5548, 4}, {8331, 4}, {8341, 4}, {8342, 4}, {8346, 4}, {8349, 4}, diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java index 61689aaa7b..887abb22de 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/TradeController.java @@ -68,7 +68,7 @@ public class TradeController } } - private TradeController() + protected TradeController() { boolean limitedItem = false; _lists = new HashMap<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java index 96e4e7fc3d..8c086a3458 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/CrestCache.java @@ -47,7 +47,7 @@ public class CrestCache private int _loadedFiles; private long _bytesBuffLen; - private CrestCache() + protected CrestCache() { convertOldPedgeFiles(); reload(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/HtmCache.java index 111c40ee48..faf97923c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/HtmCache.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/HtmCache.java @@ -39,7 +39,7 @@ public class HtmCache private int _loadedFiles; private long _bytesBuffLen; - private HtmCache() + protected HtmCache() { _cache = new HashMap<>(); reload(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2f29646d79..1c3581f790 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -32,7 +32,7 @@ public class WarehouseCacheManager protected final Map _cachedWh; protected final long _cacheTime; - private WarehouseCacheManager() + protected WarehouseCacheManager() { _cacheTime = Config.WAREHOUSE_CACHE_TIME * 60000; // 60*1000 = 60000 _cachedWh = new ConcurrentHashMap<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java index 7544304f90..f3e424c7da 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java @@ -33,7 +33,7 @@ public class HeroSkillTable }; private static Skill[] HERO_SKILLS; - private HeroSkillTable() + protected HeroSkillTable() { HERO_SKILLS = new Skill[5]; HERO_SKILLS[0] = SkillTable.getInstance().getSkill(395, 1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java index 1a304cb9fc..175989bf70 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -73,7 +73,7 @@ public class ItemTable _crystalTypes.put("none", Item.CRYSTAL_NONE); } - private ItemTable() + protected ItemTable() { hashFiles("data/stats/items", _itemFiles); _etcItems = new HashMap<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/MobGroupTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/MobGroupTable.java index 49235a5144..b1d3c2fb24 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/MobGroupTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/MobGroupTable.java @@ -32,7 +32,7 @@ public class MobGroupTable public static final int FOLLOW_RANGE = 300; public static final int RANDOM_RANGE = 300; - private MobGroupTable() + protected MobGroupTable() { _groupMap = new HashMap<>(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/NobleSkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/NobleSkillTable.java index 7710ccd187..654fde5d49 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/NobleSkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/NobleSkillTable.java @@ -25,7 +25,7 @@ public class NobleSkillTable { private static Skill[] _nobleSkills; - private NobleSkillTable() + protected NobleSkillTable() { _nobleSkills = new Skill[8]; _nobleSkills[0] = SkillTable.getInstance().getSkill(1323, 1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java index aeac77a9ed..c9fd3fe23c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java @@ -36,7 +36,7 @@ public class SkillTable private final Map _skills = new HashMap<>(); private final boolean _initialized = true; - private SkillTable() + protected SkillTable() { hashFiles("data/stats/skills", _skillFiles); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ae94cda22d..a9f5f9bed8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -56,7 +56,7 @@ public class ClanTable private final Map _clans = new HashMap<>(); - private ClanTable() + protected ClanTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java index 53c7bf3f57..f24089b81c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/HelperBuffTable.java @@ -50,7 +50,7 @@ public class HelperBuffTable /** * Create and Load the Newbie Helper Buff list from SQL Table helper_buff_list */ - private HelperBuffTable() + protected HelperBuffTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java index 4f59de308b..d878b17235 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/NpcTable.java @@ -49,7 +49,7 @@ public class NpcTable private final Map _npcs = new HashMap<>(); private boolean _initialized = false; - private NpcTable() + protected NpcTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java index 66c831517e..0734e809da 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/PetDataTable.java @@ -32,7 +32,7 @@ public class PetDataTable private static Map> _petTable = new HashMap<>(); - private PetDataTable() + protected PetDataTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java index ccc7d3232b..30ad09c7c7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillSpellbookTable.java @@ -35,7 +35,7 @@ public class SkillSpellbookTable private static Map skillSpellbooks; - private SkillSpellbookTable() + protected SkillSpellbookTable() { skillSpellbooks = new HashMap<>(); try (Connection con = DatabaseFactory.getConnection()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java index 7ba82754c3..893cb58da7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java @@ -54,7 +54,7 @@ public class SkillTreeTable private final List _pledgeSkillTrees = new ArrayList<>(); private final List _enchantSkillTrees = new ArrayList<>(); - private SkillTreeTable() + protected SkillTreeTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java index 61186999df..d5c7cfb102 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/SpawnTable.java @@ -44,7 +44,7 @@ public class SpawnTable private int _customSpawnCount; private int _highestId; - private SpawnTable() + protected SpawnTable() { if (!Config.ALT_DEV_NO_SPAWNS) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java index 3499c370e6..ff218e9beb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TeleportLocationTable.java @@ -36,7 +36,7 @@ public class TeleportLocationTable private final Map _teleports = new HashMap<>(); - private TeleportLocationTable() + protected TeleportLocationTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index bd22a14643..41f0cb71e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -59,7 +59,7 @@ public class TradeListTable } } - private TradeListTable() + protected TradeListTable() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 57054358bd..2fb0456e74 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -40,7 +40,7 @@ public class ArmorSetData implements IXmlReader private ArmorSet[] _armorSets; - private ArmorSetData() + protected ArmorSetData() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java index aef17dc7db..8efd1add2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java @@ -67,7 +67,7 @@ public class AugmentationData private static Map> _purpleSkills = null; private static Map> _redSkills = null; - private AugmentationData() + protected AugmentationData() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java index 27fb219a74..cf7166da0b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ExperienceData.java @@ -42,7 +42,7 @@ public class ExperienceData private final Map _expTable = new HashMap<>(); - private ExperienceData() + protected ExperienceData() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 9390fc3839..b63e5b4dbd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -64,7 +64,7 @@ public class MultisellData return null; } - private MultisellData() + protected MultisellData() { parseData(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index d1bc8803b0..dc8b16d6f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -97,7 +97,7 @@ public class AdminCommandHandler private final Map _datatable; - private AdminCommandHandler() + protected AdminCommandHandler() { _datatable = new HashMap<>(); registerAdminCommandHandler(new AdminAdmin()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java index ad7c235394..6af36f0716 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -79,7 +79,7 @@ public class ItemHandler return _datatable.size(); } - private ItemHandler() + protected ItemHandler() { _datatable = new HashMap<>(); registerItemHandler(new BeastSoulShot()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java index 88ebeee067..ef6dc35a31 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java @@ -63,7 +63,7 @@ public class SkillHandler private final Map _datatable; - private SkillHandler() + protected SkillHandler() { _datatable = new HashMap<>(); registerSkillHandler(new BalanceLife()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java index ef5f9e1eb6..98b3f69a21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java @@ -42,7 +42,7 @@ public class UserCommandHandler private final Map _datatable; - private UserCommandHandler() + protected UserCommandHandler() { _datatable = new HashMap<>(); registerUserCommandHandler(new ChannelDelete()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java index 86eb57baeb..67787186e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -39,7 +39,7 @@ public class VoicedCommandHandler private final Map _datatable; - private VoicedCommandHandler() + protected VoicedCommandHandler() { _datatable = new HashMap<>(); if (Config.BANKING_SYSTEM_ENABLED) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java index 3d8352275a..77a05d986c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ArenaManager.java @@ -26,7 +26,7 @@ public class ArenaManager { private List _arenas; - private ArenaManager() + protected ArenaManager() { } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index ae76b9eba2..1845fd8a55 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -168,7 +168,7 @@ public class CastleManorManager } } - private CastleManorManager() + protected CastleManorManager() { load(); // load data from database init(); // schedule all manor related events diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java index c432cbdf6f..363a18d24b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -47,7 +47,7 @@ public class ClanHallManager return _loaded; } - private ClanHallManager() + protected ClanHallManager() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 334dcd0973..2d6c3212e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -60,7 +60,7 @@ public class DimensionalRiftManager private static final short DIMENSIONAL_FRAGMENT_ITEM_ID = 7079; private static final int MAX_PARTY_PER_AREA = 3; - private DimensionalRiftManager() + protected DimensionalRiftManager() { loadRooms(); loadSpawns(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java index 5cc692d655..9c35e95830 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -32,7 +32,7 @@ public class DuelManager private final List _duels; private int _currentDuelId = 0x90; - private DuelManager() + protected DuelManager() { LOGGER.info("Initializing DuelManager"); _duels = new ArrayList<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 1a8cd10184..3658d57e9a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -44,7 +44,7 @@ public class ItemsOnGroundManager static final Logger LOGGER = Logger.getLogger(ItemsOnGroundManager.class.getName()); protected List _items = new ArrayList<>(); - private ItemsOnGroundManager() + protected ItemsOnGroundManager() { // If SaveDroppedItem is false, may want to delete all items previously stored to avoid add old items on reactivate if (!Config.SAVE_DROPPED_ITEM) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 94cf65da60..9e7019932d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -215,7 +215,7 @@ public class PetitionManager } } - private PetitionManager() + protected PetitionManager() { _pendingPetitions = new HashMap<>(); _completedPetitions = new HashMap<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java index dfc43b665f..dacffb152c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/QuestManager.java @@ -29,7 +29,7 @@ public class QuestManager private static Map _quests = new HashMap<>(); private static int _questCount = 0; - private QuestManager() + protected QuestManager() { } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index 6924177096..06a52f1d79 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -49,7 +49,7 @@ public class RebirthManager private final HashMap _playersRebirthInfo = new HashMap<>(); - private RebirthManager() + protected RebirthManager() { // Do Nothing ^_- } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index b565a2821c..fecdec14fb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -68,7 +68,7 @@ public class SiegeManager private boolean _teleportToSiege = false; private boolean _teleportToSiegeTown = false; - private SiegeManager() + protected SiegeManager() { load(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java index a1beac2c90..d219b54e07 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/PcPoint.java @@ -32,7 +32,7 @@ public class PcPoint implements Runnable { Logger LOGGER = Logger.getLogger(PcPoint.class.getName()); - private PcPoint() + protected PcPoint() { LOGGER.info("PcBang point event started."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 1270ad52f1..41893a34ba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -52,7 +52,7 @@ public class Lottery protected boolean _isStarted; protected long _enddate; - private Lottery() + protected Lottery() { _number = 1; _prize = Config.ALT_LOTTERY_PRIZE; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java index 3469e7aa9b..6a55e72a68 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java @@ -77,7 +77,7 @@ public class World /** The _world regions. */ private WorldRegion[][] _worldRegions; - private World() + protected World() { initRegions(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java index 69cf5e1a91..1421b4a255 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java @@ -47,11 +47,11 @@ public class BoatInstance extends Creature public VehicleDeparture vd = null; private int lastx = -1; private int lasty = -1; - private int cycle = 0; - private int runstate = 0; - private BoatPathHolder pathA; - private BoatPathHolder pathB; - private boolean needOnVehicleCheckLocation = false; + protected int cycle = 0; + protected int runstate = 0; + protected BoatPathHolder pathA; + protected BoatPathHolder pathB; + protected boolean needOnVehicleCheckLocation = false; private final Set passengers = ConcurrentHashMap.newKeySet(); public BoatInstance(int objectId, CreatureTemplate template) @@ -181,7 +181,7 @@ public class BoatInstance extends Creature ThreadPool.schedule(bc, 300000); } - private void begin() + protected void begin() { if (cycle == 1) { @@ -251,7 +251,7 @@ public class BoatInstance extends Creature } } - private void say(int id) + protected void say(int id) { final Collection knownPlayers = getKnownList().getKnownPlayers().values(); CreatureSay sm; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 92f6c166e8..1e0fd7d1cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -15939,6 +15939,10 @@ public class PlayerInstance extends Playable { private DoorInstance _target = null; + public GatesRequest() + { + } + public void setTarget(DoorInstance door) { _target = door; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 8ade05b95d..55a38bf1b5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -58,7 +58,7 @@ public class Olympiad private static Map NOBLES; private static Map NOBLES_RANK; - private static List HEROS_TO_BE; + protected static List HEROS_TO_BE; private static List _nonClassBasedRegisters; private static Map> _classBasedRegisters; public static List OLY_MANAGERS = new ArrayList<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index 8fb9805ab3..48f2ce2ed7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -60,7 +60,7 @@ class OlympiadManager implements Runnable new OlympiadStadium(-114413, -213241, -3331) }; - private OlympiadManager() + protected OlympiadManager() { _olympiadInstances = new HashMap<>(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java index 11ac70e802..ed8bdf3fc8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java @@ -31,7 +31,7 @@ public class PartyMatchRoomList private int _maxid = 1; private final Map _rooms; - private PartyMatchRoomList() + protected PartyMatchRoomList() { _rooms = new HashMap<>(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java index 37619ed8dc..2c20a9b21b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchWaitingList.java @@ -28,7 +28,7 @@ public class PartyMatchWaitingList { private final List _members; - private PartyMatchWaitingList() + protected PartyMatchWaitingList() { _members = new ArrayList<>(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 998715fbd3..b19eb67b03 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final NpcInstance _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final NpcInstance _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, NpcInstance npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index ed5132c39c..e137e16048 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -194,6 +194,10 @@ public class ClanHall private class FunctionTask implements Runnable { + public FunctionTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 2f04c78927..5dd98a440f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -60,7 +60,7 @@ public class BanditStrongholdSiege extends ClanHallSiege protected boolean _finalStage = false; protected ScheduledFuture _midTimer; - private BanditStrongholdSiege() + protected BanditStrongholdSiege() { LOGGER.info("SiegeManager of Bandits Stronghold"); final long siegeDate = restoreSiegeDate(35); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java index 51de8c33cc..c8f0aa579f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java @@ -77,7 +77,7 @@ public class DevastatedCastle public long _damage; } - private DevastatedCastle() + protected DevastatedCastle() { if (Config.DEVASTATED_DAY == 1) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java index 863c99bf09..2c52068019 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java @@ -62,7 +62,7 @@ public class FortressOfResistance public long _damage; } - private FortressOfResistance() + protected FortressOfResistance() { if (Config.PARTISAN_DAY == 1) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 36054c9866..b32011c89c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -57,7 +57,7 @@ public class WildBeastFarmSiege extends ClanHallSiege protected boolean _finalStage = false; protected ScheduledFuture _midTimer; - private WildBeastFarmSiege() + protected WildBeastFarmSiege() { LOGGER.info("SiegeManager of Wild Beasts Farm"); final long siegeDate = restoreSiegeDate(63); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java index bc09e35e6d..fb954d326e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java @@ -60,7 +60,7 @@ public class AutoSpawn protected boolean _activeState = true; - private AutoSpawn() + protected AutoSpawn() { _registeredSpawns = new HashMap<>(); _runningSpawns = new HashMap<>(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index f36abae366..bc79124ecd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -71,11 +71,11 @@ public class GameClient extends MMOClient> implements private ConnectionState _state; private String _accountName; private SessionKey _sessionId; - private PlayerInstance _player; private ScheduledFuture _cleanupTask = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private int _protocolVersion; + protected PlayerInstance _player; public GameClient(MMOConnection con) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index f4667baeec..61bd9ee56c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.util.Util; */ public class RequestRestartPoint extends GameClientPacket { - private static final Logger LOGGER = Logger.getLogger(RequestRestartPoint.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(RequestRestartPoint.class.getName()); protected int _requestedPointType; protected boolean _continuation; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EventDroplist.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EventDroplist.java index 5aeb746e95..c1cb26604b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EventDroplist.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/script/EventDroplist.java @@ -49,7 +49,7 @@ public class EventDroplist /** * Constructor of EventDroplist. */ - private EventDroplist() + protected EventDroplist() { _allNpcDateDrops = new ArrayList<>(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 104afd7a0c..37dc56bc53 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -35,7 +35,7 @@ public class DecayTaskManager protected Map _decayTasks = new ConcurrentHashMap<>(); - private DecayTaskManager() + protected DecayTaskManager() { ThreadPool.scheduleAtFixedRate(new DecayScheduler(), 10000, 5000); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 0402016b7f..22e27f839a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -168,7 +168,7 @@ public class TaskManager } } - private TaskManager() + protected TaskManager() { initializate(); startAllTasks(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 1dc238d88b..c8552dbdea 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java index f5517d8abe..7d89f588a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -45,6 +45,10 @@ public class DocumentItem extends DocumentBase private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + public int id; public Enum type; public StatSet set; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java index e846b2fe83..0d15e488d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -39,6 +39,10 @@ public class DocumentSkill extends DocumentBase private class DocumentSkillDataHolder { + public DocumentSkillDataHolder() + { + } + public int id; public String name; public StatSet[] sets; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index fb83e4d0ef..ae245ebdcd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -47,6 +47,10 @@ public class HallOfSufferingAttack extends AbstractNpcAI { private class HSAWorld extends InstanceWorld { + public HSAWorld() + { + } + public Map npcList = new HashMap<>(); public Npc klodekus = null; public Npc klanikus = null; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index 29fdd492fd..78d40122f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -47,6 +47,10 @@ public class HallOfSufferingDefence extends AbstractNpcAI { private class HSDWorld extends InstanceWorld { + public HSDWorld() + { + } + public Map npcList = new HashMap<>(); public Npc klodekus = null; public Npc klanikus = null; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index e43d4ad85d..c61b16f840 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -65,6 +65,10 @@ public class HeartInfinityAttack extends AbstractNpcAI public long startTime = 0; protected ScheduledFuture timerTask; + public HIAWorld() + { + } + public synchronized void addTumorCount(int value) { tumorCount += value; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 9feebf907b..07befb2558 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -53,6 +53,10 @@ public class HeartInfinityDefence extends AbstractNpcAI { private class HIDWorld extends InstanceWorld { + public HIDWorld() + { + } + public List npcList = new ArrayList<>(); public List deadTumors = new ArrayList<>(); protected Npc deadTumor; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index d2b12946a0..f28f8b2719 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -75,12 +75,12 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest private static final int SOUL_CORE_COUNT = 10; private static final int RAGNA_ORCS_KILLS_COUNT = 100; private static final int RAGNA_ORCS_AMULET_COUNT = 10; - private static final ZoneType ALTARZONE = ZoneManager.getInstance().getZoneById(20201); - private static long respawnTime = 0; - private static Npc _altar; + protected static final ZoneType ALTARZONE = ZoneManager.getInstance().getZoneById(20201); + protected static Npc _altar; private static Npc _varangka; private static Npc _varangkaMinion1; private static Npc _varangkaMinion2; + private static long respawnTime = 0; public Q00311_ExpulsionOfEvilSpirits() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4d92c18e64..00260a27a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -615,6 +615,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index e090b5edd1..7e2b4df446 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -1404,6 +1404,10 @@ public class TerritoryWarManager implements Siegable private class closeTerritoryChannelTask implements Runnable { + public closeTerritoryChannelTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index 97f4b7382d..d7a8f9f737 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -168,6 +168,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index f48549aa5b..7417c8b362 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -203,6 +203,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 051be7a74d..4d0fe54957 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -61,7 +61,7 @@ public class Olympiad extends ListenersContainer protected static final Logger LOGGER_OLYMPIAD = Logger.getLogger("olympiad"); private static final Map NOBLES = new ConcurrentHashMap<>(); - private static List HEROS_TO_BE; + protected static List HEROS_TO_BE; private static Map NOBLES_RANK = new HashMap<>(); private static List _nonClassBasedRegisters; private static Map> _classBasedRegisters; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 31e31a7a8f..68e94b1079 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -59,7 +59,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 98a73a8c49..50d2bc4ede 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java index 03c2336e4c..9d1558cf84 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -40,6 +40,10 @@ public class DocumentItem extends DocumentBase private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentSkill.java index fd6b9104fa..30762172bf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -41,6 +41,10 @@ public class DocumentSkill extends DocumentBase private class DocumentSkillDataHolder { + public DocumentSkillDataHolder() + { + } + public int id; public String name; public StatSet[] sets; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java index c0f5a7fd44..c15f4af7ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index fb83e4d0ef..ae245ebdcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -47,6 +47,10 @@ public class HallOfSufferingAttack extends AbstractNpcAI { private class HSAWorld extends InstanceWorld { + public HSAWorld() + { + } + public Map npcList = new HashMap<>(); public Npc klodekus = null; public Npc klanikus = null; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index 29fdd492fd..78d40122f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -47,6 +47,10 @@ public class HallOfSufferingDefence extends AbstractNpcAI { private class HSDWorld extends InstanceWorld { + public HSDWorld() + { + } + public Map npcList = new HashMap<>(); public Npc klodekus = null; public Npc klanikus = null; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index e43d4ad85d..c61b16f840 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -65,6 +65,10 @@ public class HeartInfinityAttack extends AbstractNpcAI public long startTime = 0; protected ScheduledFuture timerTask; + public HIAWorld() + { + } + public synchronized void addTumorCount(int value) { tumorCount += value; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 9feebf907b..07befb2558 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -53,6 +53,10 @@ public class HeartInfinityDefence extends AbstractNpcAI { private class HIDWorld extends InstanceWorld { + public HIDWorld() + { + } + public List npcList = new ArrayList<>(); public List deadTumors = new ArrayList<>(); protected Npc deadTumor; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java index a110655af7..451f52a2c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/SeerUgoros/SeerUgoros.java @@ -63,14 +63,14 @@ public class SeerUgoros extends AbstractNpcAI private static final byte FIGHTING = 1; private static final byte DEAD = 2; // Misc - private static byte _state = DEAD; - private static boolean _weedAttack = false; + protected static byte _state = DEAD; + protected static boolean _weedAttack = false; private static boolean _weedKilledByPlayer = false; private static boolean _killedOneWeed = false; - private static Attackable _weed = null; - private static Attackable _ugoros = null; - private static PlayerInstance _attacker = null; - private static ScheduledFuture _thinkTask = null; + protected static Attackable _weed = null; + protected static Attackable _ugoros = null; + protected static PlayerInstance _attacker = null; + protected static ScheduledFuture _thinkTask = null; private SeerUgoros() { @@ -300,6 +300,10 @@ public class SeerUgoros extends AbstractNpcAI private class ThinkTask implements Runnable { + public ThinkTask() + { + } + @Override public void run() { @@ -346,7 +350,7 @@ public class SeerUgoros extends AbstractNpcAI } } - private void changeAttackTarget(Creature attacker) + protected void changeAttackTarget(Creature attacker) { _ugoros.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); _ugoros.clearAggroList(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java index 576eadf4f2..15730da96c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -90,8 +90,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index d2b12946a0..f28f8b2719 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -75,12 +75,12 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest private static final int SOUL_CORE_COUNT = 10; private static final int RAGNA_ORCS_KILLS_COUNT = 100; private static final int RAGNA_ORCS_AMULET_COUNT = 10; - private static final ZoneType ALTARZONE = ZoneManager.getInstance().getZoneById(20201); - private static long respawnTime = 0; - private static Npc _altar; + protected static final ZoneType ALTARZONE = ZoneManager.getInstance().getZoneById(20201); + protected static Npc _altar; private static Npc _varangka; private static Npc _varangkaMinion1; private static Npc _varangkaMinion2; + private static long respawnTime = 0; public Q00311_ExpulsionOfEvilSpirits() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java index 4d92c18e64..00260a27a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -615,6 +615,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index e090b5edd1..7e2b4df446 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -1404,6 +1404,10 @@ public class TerritoryWarManager implements Siegable private class closeTerritoryChannelTask implements Runnable { + public closeTerritoryChannelTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index 97f4b7382d..d7a8f9f737 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -168,6 +168,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index f48549aa5b..7417c8b362 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -203,6 +203,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 31e31a7a8f..68e94b1079 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -59,7 +59,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 98a73a8c49..50d2bc4ede 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java index 03c2336e4c..9d1558cf84 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -40,6 +40,10 @@ public class DocumentItem extends DocumentBase private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentSkill.java index fd6b9104fa..30762172bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentSkill.java @@ -41,6 +41,10 @@ public class DocumentSkill extends DocumentBase private class DocumentSkillDataHolder { + public DocumentSkillDataHolder() + { + } + public int id; public String name; public StatSet[] sets; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java index bf73aba53a..1b4065d775 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java index fe28737a71..ed5471ef61 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java @@ -39,7 +39,7 @@ public class ExEnterWorld implements IClientOutgoingPacket _epochInSeconds = (int) now.getEpochSecond(); ZoneRules rules = ZoneId.systemDefault().getRules(); _zoneIdOffsetSeconds = rules.getStandardOffset(now).getTotalSeconds(); - _daylight = (int) rules.getDaylightSavings(now).toSeconds(); + _daylight = (int) (rules.getDaylightSavings(now).toMillis() / 1000); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java index 31b6c1c7d5..5396c534e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 45ab159faa..8c01c1f8fe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>(); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java index 57527df7f4..2920c5b918 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -65,8 +65,8 @@ public class SiegeGuards extends AbstractNpcAI }; //@formatter:on @SuppressWarnings("unchecked") - private static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; - private static final boolean[] RESIDENCE_WORKING = new boolean[122]; + protected static final List[] RESIDENCE_GUARD_MAP = new CopyOnWriteArrayList[122]; + protected static final boolean[] RESIDENCE_WORKING = new boolean[122]; public SiegeGuards() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/commons/util/Rnd.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/commons/util/Rnd.java index b641445074..7881f1bccf 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/commons/util/Rnd.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/commons/util/Rnd.java @@ -27,6 +27,9 @@ public class Rnd * Thread-specific random number generator.
* Each is seeded with the thread ID, so the sequence of random numbers are unique between threads. */ + // Java 1.8 + // private static ThreadLocal RANDOM = new ThreadLocal() + // Java 10 private static ThreadLocal RANDOM = new ThreadLocal<>() { @Override diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 99f4b7b2c7..fa5cca3384 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; */ public class WarehouseCacheManager { - private static final Map CACHED_WH = new ConcurrentHashMap<>(); - private static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; + protected static final Map CACHED_WH = new ConcurrentHashMap<>(); + protected static final long CACHE_TIME = Config.WAREHOUSE_CACHE_TIME * 60000; protected WarehouseCacheManager() { @@ -49,6 +49,10 @@ public class WarehouseCacheManager private class CacheScheduler implements Runnable { + public CacheScheduler() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java index 69f610e6cc..3593bcf8db 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -56,7 +56,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class BotReportTable { // Zoey76: TODO: Split XML parsing from SQL operations, use IGameXmlReader instead of SAXParser. - private static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(BotReportTable.class.getName()); private static final int COLUMN_BOT_ID = 1; private static final int COLUMN_REPORTER_ID = 2; @@ -609,6 +609,10 @@ public class BotReportTable private class ResetPointTask implements Runnable { + public ResetPointTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java index 29800c3dd8..3824f48477 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/HeavenlyRiftManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; */ public class HeavenlyRiftManager { - private static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); + protected static final ZoneType ZONE = ZoneManager.getInstance().getZoneByName("heavenly_rift"); public static ZoneType getZone() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java index afd7061fbc..c68f5dc7ec 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java @@ -155,6 +155,10 @@ public class FortCommanderInstance extends DefenderInstance private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java index d756f6379b..a7de6e712f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SiegeFlagInstance.java @@ -165,6 +165,10 @@ public class SiegeFlagInstance extends Npc private class ScheduleTalkTask implements Runnable { + public ScheduleTalkTask() + { + } + @Override public void run() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java index 7acc4ebd94..518929826a 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/eventengine/EventMethodNotification.java @@ -74,6 +74,9 @@ public class EventMethodNotification private void invoke(Object instance) throws Exception { + // Java 1.8 + // final boolean wasAccessible = _method.isAccessible(); + // Java 10 final boolean wasAccessible = _method.canAccess(instance); if (!wasAccessible) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index e9c26eacce..7c2d57fdc6 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -60,7 +60,7 @@ public class LongTimeEvent extends Quest // Messages protected String _onEnterMsg = ""; protected String _endMsg = ""; - private int _enterAnnounceId = -1; + protected int _enterAnnounceId = -1; protected DateRange _eventPeriod = null; protected DateRange _dropPeriod; diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java index 343bca3261..70fbfab2cf 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java @@ -24,12 +24,12 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class QuestTimer { - private final String _name; - private final Quest _quest; - private final Npc _npc; - private final PlayerInstance _player; - private final boolean _isRepeating; - private ScheduledFuture _scheduler; + protected final String _name; + protected final Quest _quest; + protected final Npc _npc; + protected final PlayerInstance _player; + protected final boolean _isRepeating; + protected ScheduledFuture _scheduler; public QuestTimer(Quest quest, String name, long time, Npc npc, PlayerInstance player, boolean repeating) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java index df648a4837..43a46768c9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnterWorld.java @@ -39,7 +39,7 @@ public class ExEnterWorld implements IClientOutgoingPacket _epochInSeconds = (int) now.getEpochSecond(); ZoneRules rules = ZoneId.systemDefault().getRules(); _zoneIdOffsetSeconds = rules.getStandardOffset(now).getTotalSeconds(); - _daylight = (int) rules.getDaylightSavings(now).toSeconds(); + _daylight = (int) (rules.getDaylightSavings(now).toMillis() / 1000); } @Override diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java index b2eebb3f01..53cfa121c6 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.util.Locator; */ public class SystemPanel extends JPanel { - private static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); + protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - private static final long START_TIME = System.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java index 8d574f5a3e..fc06b8886f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -49,6 +49,10 @@ public class DocumentItem extends DocumentBase implements IXmlReader private class DocumentItemDataHolder { + public DocumentItemDataHolder() + { + } + int id; String type; StatSet set; diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java index 51d4cd3b2f..ded1786238 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MinionList.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.MinionHolder; */ public class MinionList { - private final MonsterInstance _master; + protected final MonsterInstance _master; private final List _spawnedMinions = new CopyOnWriteArrayList<>(); private final List> _respawnTasks = new CopyOnWriteArrayList<>();