From 565933653d76aeb08e89cfc6962ee321d008c7b5 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 1 Aug 2019 09:43:44 +0000 Subject: [PATCH] More final and static cleanups. --- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../HellboundIsland/QuarryRebel/QuarryRebel.java | 2 +- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../HellboundIsland/QuarryRebel/QuarryRebel.java | 2 +- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../HellboundIsland/QuarryRebel/QuarryRebel.java | 2 +- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 4 ++-- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 4 ++-- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 2 +- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 4 ++-- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../custom/KetraOrcSupport/KetraOrcSupport.java | 2 +- .../VarkaSilenosSupport/VarkaSilenosSupport.java | 2 +- .../Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java | 2 +- .../Q325_GrimCollector/Q325_GrimCollector.java | 2 +- .../Q335_TheSongOfTheHunter.java | 4 ++-- .../Q344_1000YearsTheEndOfLamentation.java | 2 +- .../quests/Q420_LittleWing/Q420_LittleWing.java | 2 +- .../quests/Q662_AGameOfCards/Q662_AGameOfCards.java | 2 +- .../org/l2jmobius/commons/util/OlympiadLogger.java | 2 +- .../communitybbs/Manager/ClanBBSManager.java | 10 +++++----- .../communitybbs/Manager/FriendsBBSManager.java | 6 +++--- .../communitybbs/Manager/MailBBSManager.java | 4 ++-- .../communitybbs/Manager/PostBBSManager.java | 2 +- .../communitybbs/Manager/RegionBBSManager.java | 4 ++-- .../communitybbs/Manager/TopicBBSManager.java | 4 ++-- .../handler/admincommandhandlers/AdminFence.java | 2 +- .../instancemanager/RaidBossPointsManager.java | 8 ++++---- .../model/actor/instance/FishermanInstance.java | 2 +- .../model/actor/instance/VillageMasterInstance.java | 2 +- .../model/entity/event/manager/EventManager.java | 6 +++--- .../org/l2jmobius/gameserver/model/quest/Quest.java | 2 +- .../scripts/ai/areas/CrumaTower/Alarm/Alarm.java | 4 ++-- .../HallOfErosionAttack/HallOfErosionAttack.java | 2 +- .../SeedOfDestruction/SeedOfDestruction.java | 2 +- .../AI/Zones/AnomicFoundry/AnomicFoundry.java | 2 +- .../scripts/ai/areas/StakatoNest/StakatoNest.java | 2 +- .../others/TerritoryManagers/TerritoryManagers.java | 4 ++-- .../RainbowSpringsChateau/RainbowSpringsChateau.java | 12 ++++++------ .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../handlers/admincommandhandlers/AdminBuffs.java | 4 ++-- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../handlers/bypasshandlers/ClanWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 2 +- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../data/scripts/instances/Kamaloka/Kamaloka.java | 2 +- .../instances/NornilsGarden/NornilsGarden.java | 4 ++-- .../game/data/scripts/quests/AbstractSagaQuest.java | 8 ++++---- .../Q00003_WillTheSealBeBroken.java | 2 +- .../Q00270_TheOneWhoEndsSilence.java | 2 +- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../quests/Q00420_LittleWing/Q00420_LittleWing.java | 2 +- .../Q00453_NotStrongEnoughAlone.java | 2 +- .../Q00454_CompletelyLost/Q00454_CompletelyLost.java | 4 ++-- .../Q00455_WingsOfSand/Q00455_WingsOfSand.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00660_AidingTheFloranVillage.java | 2 +- .../Q00694_BreakThroughTheHallOfSuffering.java | 2 +- .../Q00695_DefendTheHallOfSuffering.java | 2 +- .../Q00901_HowLavasaurusesAreMade.java | 2 +- .../Q10289_FadeToBlack/Q10289_FadeToBlack.java | 2 +- .../TerritoryWarScripts/TerritoryWarSuperClass.java | 4 ++-- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../model/actor/instance/ClassMasterInstance.java | 2 +- .../model/actor/instance/FishermanInstance.java | 2 +- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../model/olympiad/AbstractOlympiadGame.java | 6 +++--- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../data/scripts/events/SquashEvent/SquashEvent.java | 2 +- .../events/WatermelonNinja/WatermelonNinja.java | 2 +- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../Q00003_WillTheSealBeBroken.java | 2 +- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../data/scripts/events/SquashEvent/SquashEvent.java | 2 +- .../events/WatermelonNinja/WatermelonNinja.java | 2 +- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../data/scripts/events/SquashEvent/SquashEvent.java | 2 +- .../events/WatermelonNinja/WatermelonNinja.java | 2 +- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../data/scripts/events/SquashEvent/SquashEvent.java | 2 +- .../events/WatermelonNinja/WatermelonNinja.java | 2 +- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- .../data/scripts/custom/events/Elpies/Elpies.java | 2 +- .../data/scripts/custom/events/Rabbits/Rabbits.java | 4 ++-- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../data/scripts/events/SquashEvent/SquashEvent.java | 2 +- .../events/WatermelonNinja/WatermelonNinja.java | 2 +- .../handlers/admincommandhandlers/AdminBuffs.java | 10 +++++----- .../admincommandhandlers/AdminChangeAccessLevel.java | 2 +- .../handlers/admincommandhandlers/AdminFence.java | 2 +- .../admincommandhandlers/AdminShowQuests.java | 6 +++--- .../handlers/admincommandhandlers/AdminZone.java | 4 ++-- .../scripts/handlers/bypasshandlers/NpcViewMod.java | 6 +++--- .../scripts/handlers/bypasshandlers/Observation.java | 2 +- .../handlers/bypasshandlers/PrivateWarehouse.java | 2 +- .../scripts/handlers/bypasshandlers/QuestLink.java | 6 +++--- .../handlers/bypasshandlers/SupportMagic.java | 2 +- .../data/scripts/handlers/bypasshandlers/Wear.java | 2 +- .../handlers/punishmenthandlers/BanHandler.java | 2 +- .../handlers/punishmenthandlers/ChatBanHandler.java | 4 ++-- .../handlers/punishmenthandlers/JailHandler.java | 4 ++-- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00414_PathOfTheOrcRaider.java | 2 +- .../java/org/l2jmobius/gameserver/GameServer.java | 2 +- .../gameserver/instancemanager/ClanEntryManager.java | 4 ++-- .../model/actor/instance/VillageMasterInstance.java | 10 +++++----- .../gameserver/model/events/AbstractScript.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 8 ++++---- .../model/olympiad/OlympiadGameNormal.java | 2 +- .../gameserver/model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/RequestBypassToServer.java | 2 +- 454 files changed, 757 insertions(+), 757 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java index 6be42e18cf..9c435f9bf4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java @@ -139,7 +139,7 @@ public class QuarryRebel extends AbstractNpcAI return super.onKill(npc, killer, isSummon); } - private static void spawnNextMob(int npcId, Creature killer, Location loc) + private void spawnNextMob(int npcId, Creature killer, Location loc) { final Npc npc = addSpawn(npcId, loc.getX(), loc.getY(), loc.getZ(), killer.getHeading() + 32500, false, 300000); npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, killer, 1000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 7def9370ab..0b9d328cf7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index ed8ca53c13..2be5a613aa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 2931e8af4c..c2bb071c5d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -504,7 +504,7 @@ public class Q00350_EnhanceYourWeapon extends Quest /** * TODO: Implement using DocumentParser. */ - private static void load() + private void load() { try { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 494a7c6136..e432d2852a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -843,7 +843,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 157c04a392..874b325915 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 09733f9d14..73a67b3407 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -489,7 +489,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 3fdb532ed0..92046bd317 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -296,7 +296,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -357,7 +357,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -370,7 +370,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -480,7 +480,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -513,7 +513,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 267a4032ae..4adcdf4793 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2628,7 +2628,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b2e8aae61c..af53edfee9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index b31cf11057..4722964734 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java index 6be42e18cf..9c435f9bf4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java @@ -139,7 +139,7 @@ public class QuarryRebel extends AbstractNpcAI return super.onKill(npc, killer, isSummon); } - private static void spawnNextMob(int npcId, Creature killer, Location loc) + private void spawnNextMob(int npcId, Creature killer, Location loc) { final Npc npc = addSpawn(npcId, loc.getX(), loc.getY(), loc.getZ(), killer.getHeading() + 32500, false, 300000); npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, killer, 1000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 7def9370ab..0b9d328cf7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index ed8ca53c13..2be5a613aa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 7762e71b95..e9b85b7579 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -840,7 +840,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 157c04a392..874b325915 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 4025568560..7cfa5255cf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -497,7 +497,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 3fdb532ed0..92046bd317 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -296,7 +296,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -357,7 +357,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -370,7 +370,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -480,7 +480,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -513,7 +513,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 267a4032ae..4adcdf4793 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2628,7 +2628,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b2e8aae61c..af53edfee9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index b31cf11057..4722964734 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java index 6be42e18cf..9c435f9bf4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java @@ -139,7 +139,7 @@ public class QuarryRebel extends AbstractNpcAI return super.onKill(npc, killer, isSummon); } - private static void spawnNextMob(int npcId, Creature killer, Location loc) + private void spawnNextMob(int npcId, Creature killer, Location loc) { final Npc npc = addSpawn(npcId, loc.getX(), loc.getY(), loc.getZ(), killer.getHeading() + 32500, false, 300000); npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, killer, 1000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 7def9370ab..0b9d328cf7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index ed8ca53c13..2be5a613aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 7762e71b95..e9b85b7579 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -840,7 +840,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 157c04a392..874b325915 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 4025568560..7cfa5255cf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -497,7 +497,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 3fdb532ed0..92046bd317 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -296,7 +296,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -357,7 +357,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -370,7 +370,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -480,7 +480,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -513,7 +513,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 68df44ae6f..7b5aae67e2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b2e8aae61c..af53edfee9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index b31cf11057..4722964734 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 7def9370ab..0b9d328cf7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index ed8ca53c13..2be5a613aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 766a837085..a3f34772fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -838,7 +838,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 157c04a392..874b325915 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index ced6976385..68382dda3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -497,7 +497,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 3fdb532ed0..92046bd317 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -296,7 +296,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -357,7 +357,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -370,7 +370,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -480,7 +480,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -513,7 +513,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 68df44ae6f..7b5aae67e2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 2003a84aa2..0e40b4f791 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index d85db9e38e..d235fcf0e4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index ed8ca53c13..2be5a613aa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 766a837085..a3f34772fa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -838,7 +838,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 157c04a392..874b325915 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index d8d175b741..ceaf3b310f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -501,7 +501,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 7a7c6b9f00..ccde61c4c9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -238,7 +238,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -299,7 +299,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 68df44ae6f..7b5aae67e2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 2003a84aa2..0e40b4f791 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index d85db9e38e..d235fcf0e4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 331a887e06..76952a7750 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 002e8c664d..8dd088d36e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 766a837085..a3f34772fa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -838,7 +838,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index d8d175b741..ceaf3b310f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -501,7 +501,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 7a7c6b9f00..ccde61c4c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -238,7 +238,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -299,7 +299,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 68df44ae6f..7b5aae67e2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 2003a84aa2..0e40b4f791 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 0bc9b1c3ab..27ed9f0cc5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -273,7 +273,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -328,7 +328,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 742d591b9c..cf8f22e698 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -246,7 +246,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index d85db9e38e..d235fcf0e4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 331a887e06..76952a7750 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 096e6e1fb5..19a4dfb2f7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -487,7 +487,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { // Stop all buffs. ch.getEffectList().stopEffects(info -> (info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0), true, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 1f28fa1a08..aff1ff7fb0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -836,7 +836,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index b1d220d4ad..63e04d108f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -363,7 +363,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 39217745a7..27317b90f5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -782,7 +782,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), stringId)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 5552b8bef7..503fd9f15f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 2ac0b2528a..9e4d2fba1d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -319,7 +319,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f2a18c21d4..5609e1e59f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index 622fc759c1..7cd9dc2613 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -503,7 +503,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 7a7c6b9f00..ccde61c4c9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -238,7 +238,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -299,7 +299,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 68df44ae6f..7b5aae67e2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 2003a84aa2..0e40b4f791 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index e6c758ea52..1bd895075d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -434,7 +434,7 @@ public class KetraOrcSupport extends Quest * If any Varka quest is in progress, it stops the quest (and drop all related qItems) : * @param player The player to check. */ - private static void testKetraDemote(PlayerInstance player) + private void testKetraDemote(PlayerInstance player) { if (player.isAlliedWithKetra()) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index 3dc6914b87..2ee74efd59 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -433,7 +433,7 @@ public class VarkaSilenosSupport extends Quest * If any Varka quest is in progress, it stops the quest (and drop all related qItems) : * @param player The player to check. */ - private static void testVarkaDemote(PlayerInstance player) + private void testVarkaDemote(PlayerInstance player) { if (player.isAlliedWithVarka()) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java index 333c5c976d..cd11d23cf1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java @@ -268,7 +268,7 @@ public class Q102_SeaOfSporesFever extends Quest return null; } - private static void checkItem(QuestState st, int itemId) + private void checkItem(QuestState st, int itemId) { if (st.hasQuestItems(itemId)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java index b48520ec54..3ac1134a31 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java @@ -85,7 +85,7 @@ public class Q325_GrimCollector extends Quest return st.getQuestItemsCount(ZOMBIE_HEAD) + st.getQuestItemsCount(SPINE) + st.getQuestItemsCount(ARM_BONE) + st.getQuestItemsCount(ZOMBIE_HEART) + st.getQuestItemsCount(ZOMBIE_LIVER) + st.getQuestItemsCount(SKULL) + st.getQuestItemsCount(RIB_BONE) + st.getQuestItemsCount(THIGH_BONE) + st.getQuestItemsCount(COMPLETE_SKELETON); } - private static void payback(QuestState st) + private void payback(QuestState st) { final int count = getNumberOfPieces(st); if (count > 0) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java index 595d495614..cbff7bf22a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java @@ -249,7 +249,7 @@ public class Q335_TheSongOfTheHunter extends Quest return result; } - private static void DelItemsConds(QuestState st, int[][][] ItemsConds) + private void DelItemsConds(QuestState st, int[][][] ItemsConds) { for (int[][] ItemsCond : ItemsConds) { @@ -286,7 +286,7 @@ public class Q335_TheSongOfTheHunter extends Quest return true; } - private static void GenList(QuestState st) + private void GenList(QuestState st) { // final int grade_c = 12; // final int grade_b = 6; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java index e6f8cbf466..4d703537a7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java @@ -203,7 +203,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest return htmltext; } - private static void rewards(QuestState st, int npcId) + private void rewards(QuestState st, int npcId) { switch (npcId) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java index 5a7de073f8..1b17a96883 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java @@ -703,7 +703,7 @@ public class Q420_LittleWing extends Quest return false; } - private static void giveRandomPet(QuestState st, boolean hasFairyDust) + private void giveRandomPet(QuestState st, boolean hasFairyDust) { int pet = DRAGONFLUTE_OF_TWILIGHT; int chance = Rnd.get(100); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index 059d8f1200..40eb4a896b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -634,7 +634,7 @@ public class Q662_AGameOfCards extends Quest return null; } - private static void giveReward(QuestState st, int item, int count) + private void giveReward(QuestState st, int item, int count) { final Item template = ItemTable.getInstance().getTemplate(item); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/OlympiadLogger.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/OlympiadLogger.java index a263085111..c8a2164b45 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/OlympiadLogger.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/OlympiadLogger.java @@ -27,7 +27,7 @@ public class OlympiadLogger { private static final Logger LOGGER = Logger.getLogger(OlympiadLogger.class.getName()); - public static final void add(String text, String cat) + public static void add(String text, String cat) { String date = new SimpleDateFormat("yy.MM.dd H:mm:ss").format(new Date()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java index d282cbfbbb..b9d52d897e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java @@ -165,7 +165,7 @@ public class ClanBBSManager extends BaseBBSManager return "clan/"; } - private static void sendClanMail(PlayerInstance activeChar, int clanId) + private void sendClanMail(PlayerInstance activeChar, int clanId) { final Clan clan = ClanTable.getInstance().getClan(clanId); if (clan == null) @@ -186,7 +186,7 @@ public class ClanBBSManager extends BaseBBSManager separateAndSend(content, activeChar); } - private static void sendClanManagement(PlayerInstance activeChar, int clanId) + private void sendClanManagement(PlayerInstance activeChar, int clanId) { final Clan clan = ClanTable.getInstance().getClan(clanId); if (clan == null) @@ -207,7 +207,7 @@ public class ClanBBSManager extends BaseBBSManager send1002(activeChar, clan.getIntroduction(), "", ""); } - private static void sendClanNotice(PlayerInstance activeChar, int clanId) + private void sendClanNotice(PlayerInstance activeChar, int clanId) { final Clan clan = ClanTable.getInstance().getClan(clanId); if ((clan == null) || (activeChar.getClanId() != clanId)) @@ -230,7 +230,7 @@ public class ClanBBSManager extends BaseBBSManager send1002(activeChar, clan.getNotice(), "", ""); } - private static void sendClanList(PlayerInstance activeChar, int index) + private void sendClanList(PlayerInstance activeChar, int index) { String content = HtmCache.getInstance().getHtm(CB_PATH + "clan/clanlist.htm"); @@ -312,7 +312,7 @@ public class ClanBBSManager extends BaseBBSManager separateAndSend(content, activeChar); } - private static void sendClanDetails(PlayerInstance activeChar, int clanId) + private void sendClanDetails(PlayerInstance activeChar, int clanId) { final Clan clan = ClanTable.getInstance().getClan(clanId); if (clan == null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FriendsBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FriendsBBSManager.java index 010b4faff3..71434ed643 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FriendsBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FriendsBBSManager.java @@ -226,7 +226,7 @@ public class FriendsBBSManager extends BaseBBSManager } } - private static void showFriendsList(PlayerInstance activeChar, boolean delMsg) + private void showFriendsList(PlayerInstance activeChar, boolean delMsg) { String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-list.htm"); if (content == null) @@ -282,7 +282,7 @@ public class FriendsBBSManager extends BaseBBSManager separateAndSend(content, activeChar); } - private static void showBlockList(PlayerInstance activeChar, boolean delMsg) + private void showBlockList(PlayerInstance activeChar, boolean delMsg) { String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-blocklist.htm"); if (content == null) @@ -338,7 +338,7 @@ public class FriendsBBSManager extends BaseBBSManager separateAndSend(content, activeChar); } - public static final void showMailWrite(PlayerInstance activeChar) + public static void showMailWrite(PlayerInstance activeChar) { String content = HtmCache.getInstance().getHtm(CB_PATH + "friend/friend-mail.htm"); if (content == null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java index 0dbf62ed4a..b7f629b63f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java @@ -521,13 +521,13 @@ public class MailBBSManager extends BaseBBSManager separateAndSend(content, activeChar); } - private static void showWriteView(PlayerInstance activeChar) + private void showWriteView(PlayerInstance activeChar) { String content = HtmCache.getInstance().getHtm(CB_PATH + "mail/mail-write.htm"); separateAndSend(content, activeChar); } - private static void showWriteView(PlayerInstance activeChar, String parcipientName, Mail letter) + private void showWriteView(PlayerInstance activeChar, String parcipientName, Mail letter) { String content = HtmCache.getInstance().getHtm(CB_PATH + "mail/mail-reply.htm"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java index 3d040c8dff..a0e7efffcc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java @@ -190,7 +190,7 @@ public class PostBBSManager extends BaseBBSManager } } - private static void showHtmlEditPost(Topic topic, PlayerInstance player, Forum forum, Post p) + private void showHtmlEditPost(Topic topic, PlayerInstance player, Forum forum, Post p) { final String html = "

HOME > " + forum.getName() + " Form
&$413;" + topic.getName() + "
&$427;
  
"; send1001(html, player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/RegionBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/RegionBBSManager.java index 7c6efd3022..458bc91f79 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/RegionBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/RegionBBSManager.java @@ -71,7 +71,7 @@ public class RegionBBSManager extends BaseBBSManager return "region/"; } - private static void showRegionsList(PlayerInstance player) + private void showRegionsList(PlayerInstance player) { final String content = HtmCache.getInstance().getHtm(CB_PATH + "region/castlelist.htm"); @@ -85,7 +85,7 @@ public class RegionBBSManager extends BaseBBSManager separateAndSend(content.replace("%castleList%", sb.toString()), player); } - private static void showRegion(PlayerInstance player, int castleId) + private void showRegion(PlayerInstance player, int castleId) { final Castle castle = CastleManager.getInstance().getCastleById(castleId); final Clan owner = ClanTable.getInstance().getClan(castle.getOwnerId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java index 2594ba04ab..58f9d50851 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java @@ -225,7 +225,7 @@ public class TopicBBSManager extends BaseBBSManager return null; } - private static void showNewTopic(Forum forum, PlayerInstance player, int idf) + private void showNewTopic(Forum forum, PlayerInstance player, int idf) { if (forum == null) { @@ -243,7 +243,7 @@ public class TopicBBSManager extends BaseBBSManager } } - private static void showMemoNewTopics(Forum forum, PlayerInstance player) + private void showMemoNewTopics(Forum forum, PlayerInstance player) { final String html = "

HOME > Memo Form
&$413;
&$427;
  
"; send1001(html, player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFence.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFence.java index 7d21bd33db..e09b03cb17 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFence.java @@ -173,7 +173,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = HtmlUtil.createPage(FenceData.getInstance().getFences().values(), page, 10, currentPage -> { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java index 4de9673822..f6973ea2a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java @@ -42,7 +42,7 @@ public class RaidBossPointsManager private static final Comparator> _comparator = (entry, entry1) -> entry.getValue().equals(entry1.getValue()) ? 0 : entry.getValue() < entry1.getValue() ? 1 : -1; - public static final void init() + public static void init() { _list = new HashMap<>(); final List _chars = new ArrayList<>(); @@ -81,7 +81,7 @@ public class RaidBossPointsManager } } - public static final void updatePointsInDB(PlayerInstance player, int raidId, int points) + public static void updatePointsInDB(PlayerInstance player, int raidId, int points) { try (Connection con = DatabaseFactory.getConnection()) { @@ -99,7 +99,7 @@ public class RaidBossPointsManager } } - public static final void addPoints(PlayerInstance player, int bossId, int points) + public static void addPoints(PlayerInstance player, int bossId, int points) { final int ownerId = player.getObjectId(); Map tmpPoint = new HashMap<>(); @@ -152,7 +152,7 @@ public class RaidBossPointsManager return _list.get(player.getObjectId()); } - public static final void cleanUp() + public static void cleanUp() { try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index b6de433c0e..c7d3c81277 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -200,7 +200,7 @@ public class FishermanInstance extends FolkInstance player.sendPacket(ActionFailed.STATIC_PACKET); } - private static void sendHtml(PlayerInstance player, FishermanInstance npc, String htmlName) + private void sendHtml(PlayerInstance player, FishermanInstance npc, String htmlName) { final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setFile("data/html/fisherman/championship/" + htmlName); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 405c8b1c6c..8e6d8b0ee2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -843,7 +843,7 @@ public class VillageMasterInstance extends FolkInstance * @param pledgeType the pledge type * @param pledgeName the pledge name */ - private static final void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/manager/EventManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/manager/EventManager.java index 269658c4e4..c74cd5512f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/manager/EventManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/manager/EventManager.java @@ -140,7 +140,7 @@ public class EventManager } } - private static void registerTvT() + private void registerTvT() { TvT.loadData(); if (!TvT.checkStartJoinOk()) @@ -158,7 +158,7 @@ public class EventManager } } - private static void registerCTF() + private void registerCTF() { CTF.loadData(); if (!CTF.checkStartJoinOk()) @@ -176,7 +176,7 @@ public class EventManager } } - private static void registerDM() + private void registerDM() { DM.loadData(); if (!DM.checkStartJoinOk()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 80123919a1..af7ccd4878 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1087,7 +1087,7 @@ public class Quest extends ManagedScript * Add state of quests, drops and variables for quests in the HashMap _quest of PlayerInstance * @param player : Player who is entering the world */ - public static final void playerEnter(PlayerInstance player) + public static void playerEnter(PlayerInstance player) { if (Config.ALT_DEV_NO_QUESTS) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java index 2f63b32963..6c8debb5d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java @@ -266,7 +266,7 @@ public class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static void setMemoState(PlayerInstance player, int questId, int memoState) + private void setMemoState(PlayerInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -321,7 +321,7 @@ public class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) + private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 11f1ddd897..3541b12211 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -597,7 +597,7 @@ public class HallOfErosionAttack extends AbstractNpcAI return ""; } - private static void finishInstance(InstanceWorld world) + private void finishInstance(InstanceWorld world) { if (world instanceof HEAWorld) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 0b655c16de..7374e98e01 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -957,7 +957,7 @@ public class SeedOfDestruction extends AbstractNpcAI } } - private static void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { ch.stopAllEffectsExceptThoseThatLastThroughDeath(); if (ch.hasSummon()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java index a3b1c35115..45fbed2f5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java @@ -250,7 +250,7 @@ public class AnomicFoundry extends AbstractNpcAI } // Zoey76: TODO: This should be done with onFactionCall(..) - private static void requestHelp(Npc requester, PlayerInstance agressor, int range, int helperId) + private void requestHelp(Npc requester, PlayerInstance agressor, int range, int helperId) { for (Spawn spawn : SpawnTable.getInstance().getSpawns(helperId)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java index 3225d873c1..4dcd55590a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java @@ -244,7 +244,7 @@ public class StakatoNest extends AbstractNpcAI return null; } - private static void giveCocoon(PlayerInstance player, Npc npc) + private void giveCocoon(PlayerInstance player, Npc npc) { player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java index 1c6ae9abbb..025d78a50f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java @@ -262,7 +262,7 @@ public class TerritoryManagers extends AbstractNpcAI * @param questId the quest Id of the quest that will be processed * @param itemIds the item Ids should be deleted */ - private static void processNoblesseQuest(PlayerInstance player, int questId, int[] itemIds) + private void processNoblesseQuest(PlayerInstance player, int questId, int[] itemIds) { final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) @@ -299,7 +299,7 @@ public class TerritoryManagers extends AbstractNpcAI * @param event the event leading to this deletion * @param npc the npc referencing this deletion */ - private static void deleteIfExist(PlayerInstance player, int itemId, String event, Npc npc) + private void deleteIfExist(PlayerInstance player, int itemId, String event, Npc npc) { final ItemInstance item = player.getInventory().getItemByItemId(itemId); if (item != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 42796cda7b..6cb9aeba14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -741,7 +741,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine } } - private static void moveGourds() + private void moveGourds() { final Spawn[] tempArray = _gourds; final int iterator = _acceptedClans.size(); @@ -756,20 +756,20 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine } } - private static void reduceGourdHp(int index, PlayerInstance player) + private void reduceGourdHp(int index, PlayerInstance player) { final Spawn gourd = _gourds[index]; gourd.getLastSpawn().reduceCurrentHp(1000, player, null); } - private static void increaseGourdHp(int index) + private void increaseGourdHp(int index) { final Spawn gourd = _gourds[index]; final Npc gourdNpc = gourd.getLastSpawn(); gourdNpc.setCurrentHp(gourdNpc.getCurrentHp() + 1000); } - private static void castDebuffsOnEnemies(int myArena) + private void castDebuffsOnEnemies(int myArena) { for (int id : ARENA_ZONES) { @@ -792,7 +792,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine } } - private static void shoutRandomText(Npc npc) + private void shoutRandomText(Npc npc) { final int length = _textPassages.length; @@ -841,7 +841,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine return false; } - private static void updateAttacker(int clanId, long count, boolean remove) + private void updateAttacker(int clanId, long count, boolean remove) { try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java index e5eb3c77ff..35087d1525 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -219,7 +219,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index 35d98bac93..ec37331e51 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -235,7 +235,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -248,7 +248,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(Set npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(Set npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index 56577cdec6..2604ccfc2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -351,7 +351,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -378,7 +378,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index eba4feec8b..398012634f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index ac38a86292..89aa310ff4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -173,7 +173,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = HtmlUtil.createPage(FenceData.getInstance().getFences().values(), page, 10, currentPage -> { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index acad18a883..08da50bc65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -152,7 +152,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); @@ -170,7 +170,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -316,7 +316,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 45f54ddc9f..8a94a4a3e2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); @@ -162,7 +162,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 625ee61f50..286088aef0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -122,7 +122,7 @@ public class ClanWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player, WarehouseListType itemtype, byte sortorder) + private void showWithdrawWindow(PlayerInstance player, WarehouseListType itemtype, byte sortorder) { player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 7d9b779e1a..d44ed00b1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -235,7 +235,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 74cfd23107..73d7085bf8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -155,7 +155,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index 8089074aa5..5609049894 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -106,7 +106,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player, WarehouseListType itemtype, byte sortorder) + private void showWithdrawWindow(PlayerInstance player, WarehouseListType itemtype, byte sortorder) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index 9b052563c6..d7b7c96fff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -94,7 +94,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitor()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 06ec4447af..f93f436005 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final BuyListHolder buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 89e9a1f1a8..2b0e15e01a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index f3e7cf2b6a..fc72560b69 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -154,7 +154,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstanceId(0); @@ -202,7 +202,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index b9854be09e..c249c9f433 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -507,7 +507,7 @@ public class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static void removeBuffs(Creature ch) + private void removeBuffs(Creature ch) { final Function removeBuffs = info -> { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index 09a26ba335..17b0a1de5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -167,7 +167,7 @@ public class NornilsGarden extends AbstractInstance }; // @formatter:on - private static void dropHerb(Npc mob, PlayerInstance player, int[][] drop) + private void dropHerb(Npc mob, PlayerInstance player, int[][] drop) { final int chance = getRandom(100); for (int[] element : drop) @@ -179,7 +179,7 @@ public class NornilsGarden extends AbstractInstance } } - private static void giveBuffs(Creature ch) + private void giveBuffs(Creature ch) { if (skill1 != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java index b052b8fb0b..f9a86e6463 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java @@ -1106,23 +1106,23 @@ public abstract class AbstractSagaQuest extends Quest } } - private static void addSpawn(QuestState st, Npc mob) + private void addSpawn(QuestState st, Npc mob) { SPAWN_LIST.put(mob, st.getPlayer().getObjectId()); } - private static void autoChat(Npc npc, String text) + private void autoChat(Npc npc, String text) { npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.GENERAL, npc.getId(), text)); } - private static void cast(Npc npc, Creature target, int skillId, int level) + private void cast(Npc npc, Creature target, int skillId, int level) { target.broadcastPacket(new MagicSkillUse(target, target, skillId, level, 6000, 1)); target.broadcastPacket(new MagicSkillUse(npc, npc, skillId, level, 6000, 1)); } - private static void DeleteSpawn(QuestState st, Npc npc) + private void DeleteSpawn(QuestState st, Npc npc) { if (SPAWN_LIST.containsKey(npc)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 08c19e2c84..5d40dcc542 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -154,7 +154,7 @@ public class Q00003_WillTheSealBeBroken extends Quest return htmltext; } - private static void giveItem(PlayerInstance player, QuestState qs, int item, int... items) + private void giveItem(PlayerInstance player, QuestState qs, int item, int... items) { if (!hasQuestItems(player, item)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index 61cbc98f9c..dc43f8642f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -444,7 +444,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest * @param chance the reward chance * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item */ - private static void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) + private void giveItem(PlayerInstance player, Npc npc, int chance, boolean atLeastOne) { if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index 481d027dd0..90638b0aff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index efdf3e0028..376984e1cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -505,7 +505,7 @@ public class Q00350_EnhanceYourWeapon extends Quest /** * TODO: Implement using DocumentParser. */ - private static void load() + private void load() { try { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 181d2bc361..75306f2e56 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -842,7 +842,7 @@ public class Q00420_LittleWing extends Quest * Gives the reward to the player. * @param player the player */ - private static void giveReward(PlayerInstance player) + private void giveReward(PlayerInstance player) { final int random = getRandom(100); for (int i : EGGS) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 0654919a8a..a2a4314bcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -342,7 +342,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest return htmltext; } - private static void checkProgress(QuestState qs, int count, int... mobs) + private void checkProgress(QuestState qs, int count, int... mobs) { for (int mob : mobs) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java index 20bc5cd5d7..824d198b9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java @@ -781,7 +781,7 @@ public class Q00454_CompletelyLost extends Quest * @param npc the NPC * @param stringId the NPC String */ - private static void broadcastNpcSay(Npc npc, NpcStringId stringId) + private void broadcastNpcSay(Npc npc, NpcStringId stringId) { Broadcast.toKnownPlayers(npc, new NpcSay(npc, ChatType.NPC_GENERAL, stringId)); } @@ -792,7 +792,7 @@ public class Q00454_CompletelyLost extends Quest * @param player the player * @param stringId the NPC String */ - private static void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) + private void whisper(Npc npc, PlayerInstance player, NpcStringId stringId) { player.sendPacket(new NpcSay(npc.getObjectId(), ChatType.WHISPER, npc.getId(), stringId)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 2e7abf8a21..4794b7ef38 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -193,7 +193,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static void giveItems(QuestState qs) + private void giveItems(QuestState qs) { final PlayerInstance player = qs.getPlayer(); int chance; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index e69186a273..c8c3e2df7e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -318,7 +318,7 @@ public class Q00456_DontKnowDontCare extends Quest return super.onKill(npc, killer, isSummon); } - private static void rewardPlayer(PlayerInstance player, Npc npc) + private void rewardPlayer(PlayerInstance player, Npc npc) { final int chance = getRandom(10000); final int reward; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java index 5f27a5bc2c..d7af7cca41 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java @@ -345,7 +345,7 @@ public class Q00660_AidingTheFloranVillage extends Quest return htmltext; } - private static void tradeItems(PlayerInstance player, long required, long itemCount1, long itemCount2, long itemCount3) + private void tradeItems(PlayerInstance player, long required, long itemCount1, long itemCount2, long itemCount3) { if (itemCount1 < required) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index 8f4af84cbe..d15f1621bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -276,7 +276,7 @@ public class Q00694_BreakThroughTheHallOfSuffering extends Quest return htmltext; } - private static void finishInstance(PlayerInstance player) + private void finishInstance(PlayerInstance player) { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java index 949cde03fb..190312aa3c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java @@ -245,7 +245,7 @@ public class Q00695_DefendTheHallOfSuffering extends Quest return htmltext; } - private static void finishInstance(PlayerInstance player) + private void finishInstance(PlayerInstance player) { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index f09ecfe77f..7b46414a6d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -201,7 +201,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - private static void giveQuestItems(QuestState qs, int itemId) + private void giveQuestItems(QuestState qs, int itemId) { final PlayerInstance player = qs.getPlayer(); if (getQuestItemsCount(player, itemId) < 10) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 096e40bc8e..6733506e98 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -324,7 +324,7 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static void rewardPlayer(QuestState qs, boolean isLucky) + private void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index 60c2cc30f2..e9cbe07fa1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -430,7 +430,7 @@ public class TerritoryWarSuperClass extends Quest } } - private static void handleBecomeMercenaryQuest(PlayerInstance player, boolean catapult) + private void handleBecomeMercenaryQuest(PlayerInstance player, boolean catapult) { int enemyCount = 10; int catapultCount = 1; @@ -469,7 +469,7 @@ public class TerritoryWarSuperClass extends Quest } } - private static void handleStepsForHonor(PlayerInstance player) + private void handleStepsForHonor(PlayerInstance player) { final QuestState _sfh = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); if ((_sfh != null) && _sfh.isStarted()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index e75d22e905..127832e9d6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -499,7 +499,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java index 870963a0af..3d0ea11c17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java @@ -186,7 +186,7 @@ public class ClassMasterInstance extends MerchantInstance player.sendPacket(new TutorialShowQuestionMark(1001)); } - private static void showHtmlMenu(PlayerInstance player, int objectId, int level) + private void showHtmlMenu(PlayerInstance player, int objectId, int level) { final NpcHtmlMessage html = new NpcHtmlMessage(objectId); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 05e842736f..3ab2bee594 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -143,7 +143,7 @@ public class FishermanInstance extends MerchantInstance } } - private static void sendHtml(PlayerInstance player, Npc npc, String htmlName) + private void sendHtml(PlayerInstance player, Npc npc, String htmlName) { final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setFile(player, "data/html/fisherman/championship/" + htmlName); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index 52d9a307b9..bfcfa6b86d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -907,7 +907,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -968,7 +968,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -981,7 +981,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1092,7 +1092,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1125,7 +1125,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 83d79fc8a3..0c43ec5939 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -196,7 +196,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -340,7 +340,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 3c66b1f2e2..9b2f47e94f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -711,7 +711,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d5723a9224..e3e0b3ecae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -286,7 +286,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 05717167bc..ae714c3ec0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 8d635fae4a..0bc00b6d4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 58dc359941..56172c884b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); final int chance = Rnd.get(100); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 770eabc3d0..dd7fa70e4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e99d2e526b..96d579fdea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitors()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 7616f81e3c..d355fe110e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -155,7 +155,7 @@ public class Q00003_WillTheSealBeBroken extends Quest return htmltext; } - private static void giveItem(PlayerInstance player, QuestState qs, int item, int... items) + private void giveItem(PlayerInstance player, QuestState qs, int item, int... items) { if (!hasQuestItems(player, item)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index ecc563580b..a4cc8087f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 03f5dc5cde..0cd98429a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest return htmltext; } - private static void attackPlayer(Attackable npc, PlayerInstance player) + private void attackPlayer(Attackable npc, PlayerInstance player) { if ((npc != null) && (player != null)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index 8bf2bd0cd6..7e80a1a4fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -490,7 +490,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca47044bbe..e5490d3003 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -956,7 +956,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -969,7 +969,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1079,7 +1079,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1112,7 +1112,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index b73c40dbc0..20b61525b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2603,7 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c5febecb8c..8f67a7adc3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 05717167bc..ae714c3ec0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 8d635fae4a..0bc00b6d4e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 58dc359941..56172c884b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); final int chance = Rnd.get(100); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 770eabc3d0..dd7fa70e4e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index cab51198dc..33e2292a03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e99d2e526b..96d579fdea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitors()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index ecc563580b..a4cc8087f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 03f5dc5cde..0cd98429a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest return htmltext; } - private static void attackPlayer(Attackable npc, PlayerInstance player) + private void attackPlayer(Attackable npc, PlayerInstance player) { if ((npc != null) && (player != null)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index 8bf2bd0cd6..7e80a1a4fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -490,7 +490,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca47044bbe..e5490d3003 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -956,7 +956,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -969,7 +969,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1079,7 +1079,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1112,7 +1112,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index b73c40dbc0..20b61525b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2603,7 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c5febecb8c..8f67a7adc3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 05717167bc..ae714c3ec0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 8d635fae4a..0bc00b6d4e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 58dc359941..56172c884b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); final int chance = Rnd.get(100); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 4aa2f3fef1..ac6ad2f0f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e99d2e526b..96d579fdea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitors()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index ecc563580b..a4cc8087f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 03f5dc5cde..0cd98429a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest return htmltext; } - private static void attackPlayer(Attackable npc, PlayerInstance player) + private void attackPlayer(Attackable npc, PlayerInstance player) { if ((npc != null) && (player != null)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index 8bf2bd0cd6..7e80a1a4fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -490,7 +490,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca47044bbe..e5490d3003 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -956,7 +956,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -969,7 +969,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1079,7 +1079,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1112,7 +1112,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index b73c40dbc0..20b61525b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2603,7 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c5febecb8c..8f67a7adc3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 05717167bc..ae714c3ec0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 8d635fae4a..0bc00b6d4e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 58dc359941..56172c884b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); final int chance = Rnd.get(100); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 4aa2f3fef1..ac6ad2f0f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e99d2e526b..96d579fdea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitors()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index ecc563580b..a4cc8087f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 03f5dc5cde..0cd98429a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest return htmltext; } - private static void attackPlayer(Attackable npc, PlayerInstance player) + private void attackPlayer(Attackable npc, PlayerInstance player) { if ((npc != null) && (player != null)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index afafda0dc8..ff492fb2ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -492,7 +492,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca47044bbe..e5490d3003 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -956,7 +956,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -969,7 +969,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1079,7 +1079,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1112,7 +1112,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index b73c40dbc0..20b61525b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2603,7 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c5febecb8c..8f67a7adc3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Elpies/Elpies.java index ec40747f04..24bf5d8eb6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -223,7 +223,7 @@ public class Elpies extends Event } } - private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist) + private void dropItem(Npc mob, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index d69b175011..1f1f81ec58 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -240,7 +240,7 @@ public class Rabbits extends Event return super.onAttack(npc, attacker, damage, isSummon); } - private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist) + private void dropItem(Npc npc, PlayerInstance player, int[][] droplist) { final int chance = getRandom(100); for (int[] drop : droplist) @@ -253,7 +253,7 @@ public class Rabbits extends Event } } - private static void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) + private void recordSpawn(List npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay) { final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay); if (npc.getId() == CHEST) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 05717167bc..ae714c3ec0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 8d635fae4a..0bc00b6d4e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); for (int[] drop : DROPLIST) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 58dc359941..56172c884b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent return npc.getId() + ".htm"; } - private static final void dropItem(Npc mob, PlayerInstance player) + private void dropItem(Npc mob, PlayerInstance player) { final int npcId = mob.getId(); final int chance = Rnd.get(100); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index bd256ec4fd..01f3b4fd0b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) + private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree(); for (Skill skill : skills) @@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) + private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) @@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeBuff(PlayerInstance activeChar, int objId, int skillId) + private void removeBuff(PlayerInstance activeChar, int objId, int skillId) { Creature target = null; try @@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void removeAllBuffs(PlayerInstance activeChar, int objId) + private void removeAllBuffs(PlayerInstance activeChar, int objId) { Creature target = null; try @@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler } } - private static void viewBlockedEffects(PlayerInstance activeChar, int objId) + private void viewBlockedEffects(PlayerInstance activeChar, int objId) { Creature target = null; try diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java index b7827aa796..5392d6cf7b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java @@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler * @param player the online target * @param lvl the access level */ - private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) + private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl) { if (lvl >= 0) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java index a0584a92f6..3e600a5d4a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java @@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler return ADMIN_COMMANDS; } - private static void sendHtml(PlayerInstance activeChar, int page) + private void sendHtml(PlayerInstance activeChar, int page) { final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) -> { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index 51f29bf00c..cbc7b37f37 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler return true; } - private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) + private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor) { final StringBuilder replyMSG = new StringBuilder("
Player: " + target.getName() + "
"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler actor.sendPacket(adminReply); } - private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) + private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val) { try (Connection con = DatabaseFactory.getConnection()) { @@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler } } - private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) + private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val) { QuestState qs = target.getQuestState(val[0]); final String[] outval = new String[3]; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index 20f10b9c42..56109f858d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler return true; } - private static void showHtml(PlayerInstance activeChar) + private void showHtml(PlayerInstance activeChar) { final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); @@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - private static void getGeoRegionXY(PlayerInstance activeChar) + private void getGeoRegionXY(PlayerInstance activeChar) { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index a2be24bfba..9b7f6de2d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendNpcSkillView(PlayerInstance player, Npc npc) + private void sendNpcSkillView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/Skills.htm"); @@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler player.sendPacket(html); } - private static void sendAggroListView(PlayerInstance player, Npc npc) + private void sendAggroListView(PlayerInstance player, Npc npc) { final NpcHtmlMessage html = new NpcHtmlMessage(); html.setFile(player, "data/html/mods/NpcView/AggroList.htm"); @@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) + private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page) { final List dropList = npc.getTemplate().getDropList(dropType); if (dropList == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 4aa2f3fef1..ac6ad2f0f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -154,7 +154,7 @@ public class Observation implements IBypassHandler return false; } - private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) + private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index ca99782f8b..0d8be3baa4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -79,7 +79,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static void showWithdrawWindow(PlayerInstance player) + private void showWithdrawWindow(PlayerInstance player) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 85c1baeb1e..ea58ff3d69 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler * @param npc The table containing quests of the NpcInstance * @param quests */ - private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) + private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection quests) { final StringBuilder sbStarted = new StringBuilder(128); final StringBuilder sbCanStart = new StringBuilder(128); @@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler * @param npc the NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - private static void showQuestWindow(PlayerInstance player, Npc npc, String questId) + private void showQuestWindow(PlayerInstance player, Npc npc, String questId) { String content = null; @@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler * @param player the PlayerInstance that talk with the {@code npc}. * @param npc the NpcInstance that chats with the {@code player}. */ - private static void showQuestWindow(PlayerInstance player, Npc npc) + private void showQuestWindow(PlayerInstance player, Npc npc) { //@formatter:off final Set quests = npc.getListeners(EventType.ON_NPC_TALK).stream() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e99d2e526b..96d579fdea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler return true; } - private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) + private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon) { final int level = player.getLevel(); if (isSummon && !player.hasServitors()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 471433f31d..a519bc7ffb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static void showWearWindow(PlayerInstance player, int val) + private void showWearWindow(PlayerInstance player, int val) { final ProductList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java index 1afc251f6a..5f739668b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java @@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler * Applies all punishment effects from the player. * @param player */ - private static void applyToPlayer(PlayerInstance player) + private void applyToPlayer(PlayerInstance player) { Disconnection.of(player).defaultSequence(false); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index f9da20adbf..7f2e1df4fb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); if (delay > 0) @@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { player.sendMessage("Your Chat ban has been lifted"); player.sendPacket(new EtcStatusUpdate(player)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db77bc92ca..0ad767de9a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler * @param task * @param player */ - private static void applyToPlayer(PunishmentTask task, PlayerInstance player) + private void applyToPlayer(PunishmentTask task, PlayerInstance player) { player.setInstance(null); @@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler * Removes any punishment effects from the player. * @param player */ - private static void removeFromPlayer(PlayerInstance player) + private void removeFromPlayer(PlayerInstance player) { ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index ecc563580b..a4cc8087f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest return htmltext; } - private static void giveKillReward(PlayerInstance player, Npc npc) + private void giveKillReward(PlayerInstance player, Npc npc) { if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 03f5dc5cde..0cd98429a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest return htmltext; } - private static void attackPlayer(Attackable npc, PlayerInstance player) + private void attackPlayer(Attackable npc, PlayerInstance player) { if ((npc != null) && (player != null)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 2a93156d12..0399a932a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -494,7 +494,7 @@ public class GameServer INSTANCE = new GameServer(); } - private static void printSection(String s) + private void printSection(String s) { s = "=[ " + s + " ]"; while (s.length() < 61) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 4b9c052823..53f3e1b842 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -395,7 +395,7 @@ public class ClanEntryManager return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES); } - private static void lockPlayer(int playerId) + private void lockPlayer(int playerId) { _playerLocked.put(playerId, ThreadPool.schedule(() -> { @@ -403,7 +403,7 @@ public class ClanEntryManager }, LOCK_TIME)); } - private static void lockClan(int clanId) + private void lockClan(int clanId) { _clanLocked.put(clanId, ThreadPool.schedule(() -> { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java index ca47044bbe..e5490d3003 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java @@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance return player.getSubClasses().values().iterator(); } - private static void dissolveClan(PlayerInstance player, int clanId) + private void dissolveClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -956,7 +956,7 @@ public class VillageMasterInstance extends NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static void recoverClan(PlayerInstance player, int clanId) + private void recoverClan(PlayerInstance player, int clanId) { if (!player.isClanLeader()) { @@ -969,7 +969,7 @@ public class VillageMasterInstance extends NpcInstance clan.updateClanInDB(); } - private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1079,7 +1079,7 @@ public class VillageMasterInstance extends NpcInstance } } - private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) + private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1112,7 +1112,7 @@ public class VillageMasterInstance extends NpcInstance player.sendMessage("Pledge name changed."); } - private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) + private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index b73c40dbc0..20b61525b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2603,7 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime * @param player * @param holder */ - protected static void giveItems(PlayerInstance player, ItemHolder holder) + protected void giveItems(PlayerInstance player, ItemHolder holder) { giveItems(player, holder.getId(), holder.getCount()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c5febecb8c..8f67a7adc3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static void removals(PlayerInstance player, boolean removeParty) + protected void removals(PlayerInstance player, boolean removeParty) { try { @@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame } } - protected static void cleanEffects(PlayerInstance player) + protected void cleanEffects(PlayerInstance player) { try { @@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame } } - protected static void playerStatusBack(PlayerInstance player) + protected void playerStatusBack(PlayerInstance player) { try { @@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame } } - protected static void portPlayerBack(PlayerInstance player) + protected void portPlayerBack(PlayerInstance player) { if (player == null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 91d70f821e..9f8304b42d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index e15c62619d..72ac268d2b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable } } - private static void announce(String msg) + private void announce(String msg) { CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 642e844c33..0b32ce0af2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket /** * @param player */ - private static void comeHere(PlayerInstance player) + private void comeHere(PlayerInstance player) { final WorldObject obj = player.getTarget(); if (obj == null)