From 3e61211e142f76b530d2ef3883ca6d0c847faa6a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 26 Dec 2021 22:17:47 +0000 Subject: [PATCH] Proper naming for various methods and variables. --- .../TalkingIsland/Apprentice/Apprentice.java | 6 ++-- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../YeSegiraTeleportDevice.java | 6 ++-- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 10 +++---- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../TalkingIsland/Apprentice/Apprentice.java | 6 ++-- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../YeSegiraTeleportDevice.java | 6 ++-- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/TalkingIsland/Toyron/Toyron.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 10 +++---- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../EvasHiddenSpace/EvasHiddenSpace.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../TalkingIslandPast/TalkingIslandPast.java | 2 +- .../Q00129_PailakaDevilsLegacy.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 2 +- .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../ai/bosses/Octavis/Lydia/Lydia.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 10 +++---- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperBarton.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperHayuk.java | 18 +++++------ .../Q10284_AcquisitionOfDivineSword.java | 2 +- .../Q10286_ReunionWithSirra.java | 2 +- .../Q10287_StoryOfThoseLeft.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 10 +++---- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperBarton.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperHayuk.java | 18 +++++------ .../ThroneOfHeroesGoldberg.java | 2 +- .../ThroneOfHeroesMaryReed.java | 2 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 10 +++---- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperBarton.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperHayuk.java | 18 +++++------ .../ThroneOfHeroesGoldberg.java | 2 +- .../ThroneOfHeroesMaryReed.java | 2 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../collection/ExCollectionInfo.java | 8 ++--- .../GainakUnderground/Lailly/Lailly.java | 2 +- .../ai/areas/Rune/Roiental/Roiental.java | 2 +- .../ai/bosses/Octavis/OctavisWarzone.java | 2 +- .../ai/bosses/Teredor/TeredorWarzone.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 10 +++---- .../DimensionMakkum/DimensionMakkum.java | 2 +- .../KartiasLabyrinth/KartiaHelperAdolph.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperBarton.java | 30 +++++++++---------- .../KartiasLabyrinth/KartiaHelperHayuk.java | 18 +++++------ .../ThroneOfHeroesGoldberg.java | 2 +- .../ThroneOfHeroesMaryReed.java | 2 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../collection/ExCollectionInfo.java | 8 ++--- .../tools/accountmanager/AccountManager.java | 12 ++++---- .../java/org/l2jmobius/Config.java | 6 ++-- .../admincommandhandlers/AdminBuffs.java | 6 ++-- .../admincommandhandlers/AdminMammon.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +-- .../gameserver/model/actor/Player.java | 4 +-- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/VillageMaster.java | 2 +- .../model/itemcontainer/PlayerInventory.java | 8 ++--- .../network/serverpackets/Snoop.java | 4 +-- .../loginserver/GameServerTable.java | 14 ++++----- .../loginserver/LoginController.java | 14 ++++----- .../l2jmobius/telnet/GameStatusThread.java | 4 +-- .../accountmanager/SQLAccountManager.java | 16 +++++----- .../gsregistering/GameServerRegister.java | 4 +-- .../java/org/l2jmobius/Config.java | 6 ++-- .../admincommandhandlers/AdminBuffs.java | 6 ++-- .../admincommandhandlers/AdminMammon.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +-- .../gameserver/model/actor/Player.java | 4 +-- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/VillageMaster.java | 2 +- .../model/itemcontainer/PlayerInventory.java | 8 ++--- .../network/serverpackets/Snoop.java | 4 +-- .../l2jmobius/telnet/GameStatusThread.java | 4 +-- .../data/scripts/custom/events/Race/Race.java | 4 +-- .../handlers/itemhandlers/SoulShots.java | 6 ++-- .../DarkCloudMansion/DarkCloudMansion.java | 4 +-- .../TerritoryWarSuperClass.java | 26 ++++++++-------- .../java/org/l2jmobius/Config.java | 4 +-- .../network/clientpackets/EnterWorld.java | 6 ++-- .../data/scripts/custom/events/Race/Race.java | 4 +-- .../handlers/itemhandlers/SoulShots.java | 6 ++-- .../DarkCloudMansion/DarkCloudMansion.java | 4 +-- .../TerritoryWarSuperClass.java | 26 ++++++++-------- .../java/org/l2jmobius/Config.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../LastImperialTomb/LastImperialTomb.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../LastImperialTomb/LastImperialTomb.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 7 ++--- .../ai/bosses/Frintezza/LastImperialTomb.java | 2 +- .../RudolphsBlessing/RudolphsBlessing.java | 4 +-- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../Q00350_EnhanceYourWeapon.java | 10 +++---- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../LastImperialTomb/LastImperialTomb.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../LastImperialTomb/LastImperialTomb.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../collection/ExCollectionInfo.java | 8 ++--- .../admincommandhandlers/AdminEditChar.java | 14 ++++----- .../scripts/instances/AbstractInstance.java | 8 ++--- .../LastImperialTomb/LastImperialTomb.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../model/itemcontainer/ItemContainer.java | 6 ++-- .../gameserver/model/stats/Formulas.java | 14 ++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../serverpackets/ExInzoneWaiting.java | 2 +- .../ExListPartyMatchingWaitingRoom.java | 2 +- .../collection/ExCollectionInfo.java | 8 ++--- 369 files changed, 1098 insertions(+), 1099 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java index 4266374442..9acd290f95 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java @@ -58,10 +58,10 @@ public class Apprentice extends AbstractNpcAI final QuestState qs = player.getQuestState(Q10329_BackupSeekers.class.getSimpleName()); if ((qs != null) && qs.isStarted()) { - final Quest quest_10329 = QuestManager.getInstance().getQuest(Q10329_BackupSeekers.class.getSimpleName()); - if (quest_10329 != null) + final Quest q10329 = QuestManager.getInstance().getQuest(Q10329_BackupSeekers.class.getSimpleName()); + if (q10329 != null) { - quest_10329.notifyEvent("RESPAWN_BART", null, player); + q10329.notifyEvent("RESPAWN_BART", null, player); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index d82403b5b1..85da23b9b2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java index 96a3ce9d47..4e8369dae3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java @@ -103,10 +103,10 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI final QuestState qs = player.getQuestState(Q10365_SeekerEscort.class.getSimpleName()); if ((qs != null) && qs.isStarted() && qs.isCond(1)) { - final Quest quest_10365 = QuestManager.getInstance().getQuest(Q10365_SeekerEscort.class.getSimpleName()); - if (quest_10365 != null) + final Quest q10365 = QuestManager.getInstance().getQuest(Q10365_SeekerEscort.class.getSimpleName()); + if (q10365 != null) { - quest_10365.notifyEvent("TELEPORT_TO_NEXT_STAGE", null, player); + q10365.notifyEvent("TELEPORT_TO_NEXT_STAGE", null, player); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c0714a97c1..f81e518e0c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1234,7 +1234,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1247,7 +1247,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1258,7 +1258,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1266,16 +1266,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1284,7 +1284,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 6e59885162..f3d1862994 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -247,16 +247,16 @@ public class Q00350_EnhanceYourWeapon extends Quest private static void exchangeCrystal(Player player, Attackable mob, int takeid, int giveid, boolean broke) { - Item Item = player.getInventory().destroyItemByItemId("SoulCrystal", takeid, 1, player, mob); - if (Item != null) + Item item = player.getInventory().destroyItemByItemId("SoulCrystal", takeid, 1, player, mob); + if (item != null) { // Prepare inventory update packet final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addRemovedItem(Item); + playerIU.addRemovedItem(item); // Add new crystal to the killer's inventory - Item = player.getInventory().addItem("SoulCrystal", giveid, 1, player, mob); - playerIU.addItem(Item); + item = player.getInventory().addItem("SoulCrystal", giveid, 1, player, mob); + playerIU.addItem(item); // Send a sound event and text message to the player if (broke) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6267d19156..7df46e88f2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -171,7 +171,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c424b903be..b81b25c3d7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -37,7 +37,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java index 4266374442..9acd290f95 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Apprentice/Apprentice.java @@ -58,10 +58,10 @@ public class Apprentice extends AbstractNpcAI final QuestState qs = player.getQuestState(Q10329_BackupSeekers.class.getSimpleName()); if ((qs != null) && qs.isStarted()) { - final Quest quest_10329 = QuestManager.getInstance().getQuest(Q10329_BackupSeekers.class.getSimpleName()); - if (quest_10329 != null) + final Quest q10329 = QuestManager.getInstance().getQuest(Q10329_BackupSeekers.class.getSimpleName()); + if (q10329 != null) { - quest_10329.notifyEvent("RESPAWN_BART", null, player); + q10329.notifyEvent("RESPAWN_BART", null, player); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index d82403b5b1..85da23b9b2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java index 96a3ce9d47..4e8369dae3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java @@ -103,10 +103,10 @@ public class YeSegiraTeleportDevice extends AbstractNpcAI final QuestState qs = player.getQuestState(Q10365_SeekerEscort.class.getSimpleName()); if ((qs != null) && qs.isStarted() && qs.isCond(1)) { - final Quest quest_10365 = QuestManager.getInstance().getQuest(Q10365_SeekerEscort.class.getSimpleName()); - if (quest_10365 != null) + final Quest q10365 = QuestManager.getInstance().getQuest(Q10365_SeekerEscort.class.getSimpleName()); + if (q10365 != null) { - quest_10365.notifyEvent("TELEPORT_TO_NEXT_STAGE", null, player); + q10365.notifyEvent("TELEPORT_TO_NEXT_STAGE", null, player); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ecfea751d3..f79bde798b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 985ed1bce2..8221686368 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -176,7 +176,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c424b903be..b81b25c3d7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -37,7 +37,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index 262ede90be..219f1f4879 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ecfea751d3..f79bde798b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 985ed1bce2..8221686368 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -176,7 +176,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c424b903be..b81b25c3d7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -37,7 +37,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index 262ede90be..219f1f4879 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ecfea751d3..f79bde798b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index de61ef0941..8f8d19e79e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -176,7 +176,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index 262ede90be..219f1f4879 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ef79aaf50f..6a3bcf569b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index fbb8e630c9..2984bfe1af 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index 262ede90be..219f1f4879 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index d0c871eb63..0fc681523d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ef79aaf50f..6a3bcf569b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7b68dd4529..ece6c7dfa1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java index 262ede90be..219f1f4879 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/Toyron.java @@ -50,7 +50,7 @@ public class Toyron extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (event.equals("museum_teleport")) { if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index d0c871eb63..0fc681523d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ef79aaf50f..6a3bcf569b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1267,7 +1267,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1278,7 +1278,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1286,16 +1286,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1304,7 +1304,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java index efbe29a2cf..ee93163066 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { - enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(p.getName()))); + enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.C1_YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON).addString(member.getName()))); return; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java index 629a28165d..8211e90098 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/EvasHiddenSpace/EvasHiddenSpace.java @@ -74,7 +74,7 @@ public class EvasHiddenSpace extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index e7996fc540..e90ed70af0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DIE_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java index b2cb5819cf..b0f641adfe 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java @@ -68,7 +68,7 @@ public class TalkingIslandPast extends AbstractInstance } else if (event.equals("exitInstance")) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 44db353ff3..8afec644ae 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -233,7 +233,7 @@ public class Q00129_PailakaDevilsLegacy extends Quest } else { - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index ba19b133f1..8f024cd03b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -200,7 +200,7 @@ public class Q00144_PailakaInjuredDragon extends Quest { htmltext = getNoQuestLevelRewardMsg(player); } - final Instance inst = InstanceManager.getInstance().getPlayer(player, true); + final Instance inst = InstanceManager.getInstance().getPlayerInstance(player, true); if (inst != null) { inst.finishInstance(); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 9c3e753a83..c91e4600de 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7b68dd4529..ece6c7dfa1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java index a90489baf1..190f1ce9ea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/Lydia/Lydia.java @@ -46,7 +46,7 @@ public class Lydia extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == OCTAVIS_TEMPLATE_ID) || (instance.getTemplateId() == OCTAVIS_EXTREME_TEMPLATE_ID))) { htmltext = "Lydia-02.html"; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3a54fc66b5..aa636ef830 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1255,7 +1255,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1268,7 +1268,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1279,7 +1279,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1287,16 +1287,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1305,7 +1305,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java index 92af82e1e7..c5c1387eb3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { - enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName()))); + enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index c154b12a5b..00241b7b77 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -47,7 +47,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index 343aae82bb..40473df637 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 1418b8a4f9..ced5b92e0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -174,11 +174,11 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity"); - final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker"); - final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane"); - final SkillHolder skill_04 = instParams.getSkillHolder("bartonPowerBomber"); - final SkillHolder skill_05 = instParams.getSkillHolder("bartonSonicStar"); + final SkillHolder skill1 = instParams.getSkillHolder("bartonInfinity"); + final SkillHolder skill2 = instParams.getSkillHolder("bartonBerserker"); + final SkillHolder skill3 = instParams.getSkillHolder("bartonHurricane"); + final SkillHolder skill4 = instParams.getSkillHolder("bartonPowerBomber"); + final SkillHolder skill5 = instParams.getSkillHolder("bartonSonicStar"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -187,46 +187,46 @@ public class KartiaHelperBarton extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill(), null, true, false); + npc.doCast(skill4.getSkill(), null, true, false); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 14a11229c9..93969008a5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -175,9 +175,9 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot"); - final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot"); - final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow"); + final SkillHolder skill1 = instParams.getSkillHolder("hayukPinpointShot"); + final SkillHolder skill2 = instParams.getSkillHolder("hayukRecoilShot"); + final SkillHolder skill3 = instParams.getSkillHolder("hayukMultipleArrow"); final int numberOfActiveSkills = 3; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -186,28 +186,28 @@ public class KartiaHelperHayuk extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 6625567654..c8822c8a8a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -165,7 +165,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest qs.unset("ex3"); qs.setCond(3, true); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index 21a14810fd..b9a00e8388 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -103,7 +103,7 @@ public class Q10286_ReunionWithSirra extends Quest { qs.unset("ex"); qs.setMemoState(2); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index becdf2fbdd..c072297d38 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -202,7 +202,7 @@ public class Q10287_StoryOfThoseLeft extends Quest qs.unset("ex1"); qs.unset("ex2"); - final Instance world = InstanceManager.getInstance().getPlayer(player, true); + final Instance world = InstanceManager.getInstance().getPlayerInstance(player, true); if (world != null) { world.finishInstance(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 85257062b2..234f9144f4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 17166c416c..d06cbe4b5c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -176,7 +176,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 6610efbd18..77ea59eef5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -115,7 +115,7 @@ public class Roiental extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == TOH_GB_TEMPLATE_ID))) { htmltext = "Roiental-02a.html"; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 4fb2d739ba..71844e0e0d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1257,7 +1257,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1270,7 +1270,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1281,7 +1281,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1289,16 +1289,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1307,7 +1307,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java index 92af82e1e7..c5c1387eb3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { - enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName()))); + enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index 8e1fb18f01..9e06df3365 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index 343aae82bb..40473df637 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 1418b8a4f9..ced5b92e0e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -174,11 +174,11 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity"); - final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker"); - final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane"); - final SkillHolder skill_04 = instParams.getSkillHolder("bartonPowerBomber"); - final SkillHolder skill_05 = instParams.getSkillHolder("bartonSonicStar"); + final SkillHolder skill1 = instParams.getSkillHolder("bartonInfinity"); + final SkillHolder skill2 = instParams.getSkillHolder("bartonBerserker"); + final SkillHolder skill3 = instParams.getSkillHolder("bartonHurricane"); + final SkillHolder skill4 = instParams.getSkillHolder("bartonPowerBomber"); + final SkillHolder skill5 = instParams.getSkillHolder("bartonSonicStar"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -187,46 +187,46 @@ public class KartiaHelperBarton extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill(), null, true, false); + npc.doCast(skill4.getSkill(), null, true, false); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 14a11229c9..93969008a5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -175,9 +175,9 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot"); - final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot"); - final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow"); + final SkillHolder skill1 = instParams.getSkillHolder("hayukPinpointShot"); + final SkillHolder skill2 = instParams.getSkillHolder("hayukRecoilShot"); + final SkillHolder skill3 = instParams.getSkillHolder("hayukMultipleArrow"); final int numberOfActiveSkills = 3; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -186,28 +186,28 @@ public class KartiaHelperHayuk extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index 438dff7f03..f3cb5c764c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -76,7 +76,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index a49f465b7e..b6f0fc0962 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -77,7 +77,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 91d52ccb64..7987a30e90 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -74,7 +74,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 85257062b2..234f9144f4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a79c7987d2..21a1169765 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -181,7 +181,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 6610efbd18..77ea59eef5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -115,7 +115,7 @@ public class Roiental extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == TOH_GB_TEMPLATE_ID))) { htmltext = "Roiental-02a.html"; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 4fb2d739ba..71844e0e0d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1257,7 +1257,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1270,7 +1270,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1281,7 +1281,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1289,16 +1289,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1307,7 +1307,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java index 92af82e1e7..c5c1387eb3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { - enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName()))); + enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index 8e1fb18f01..9e06df3365 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index 343aae82bb..40473df637 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 1418b8a4f9..ced5b92e0e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -174,11 +174,11 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity"); - final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker"); - final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane"); - final SkillHolder skill_04 = instParams.getSkillHolder("bartonPowerBomber"); - final SkillHolder skill_05 = instParams.getSkillHolder("bartonSonicStar"); + final SkillHolder skill1 = instParams.getSkillHolder("bartonInfinity"); + final SkillHolder skill2 = instParams.getSkillHolder("bartonBerserker"); + final SkillHolder skill3 = instParams.getSkillHolder("bartonHurricane"); + final SkillHolder skill4 = instParams.getSkillHolder("bartonPowerBomber"); + final SkillHolder skill5 = instParams.getSkillHolder("bartonSonicStar"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -187,46 +187,46 @@ public class KartiaHelperBarton extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill(), null, true, false); + npc.doCast(skill4.getSkill(), null, true, false); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 14a11229c9..93969008a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -175,9 +175,9 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot"); - final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot"); - final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow"); + final SkillHolder skill1 = instParams.getSkillHolder("hayukPinpointShot"); + final SkillHolder skill2 = instParams.getSkillHolder("hayukRecoilShot"); + final SkillHolder skill3 = instParams.getSkillHolder("hayukMultipleArrow"); final int numberOfActiveSkills = 3; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -186,28 +186,28 @@ public class KartiaHelperHayuk extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index 438dff7f03..f3cb5c764c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -76,7 +76,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index a49f465b7e..b6f0fc0962 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -77,7 +77,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 91d52ccb64..7987a30e90 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -74,7 +74,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 85257062b2..234f9144f4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 151472d735..70983ee7e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -183,7 +183,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java index a16784571a..8c5acc7c08 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java @@ -38,12 +38,12 @@ public class ExCollectionInfo implements IClientOutgoingPacket final List _favoriteList; final int _category; - public ExCollectionInfo(Player Player, int category) + public ExCollectionInfo(Player player, int category) { - _Player = Player; - _categoryList = Player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); + _Player = player; + _categoryList = player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); _collections = _categoryList.stream().map(PlayerCollectionData::getCollectionId).collect(Collectors.toSet()); - _favoriteList = Player.getCollectionFavorites(); + _favoriteList = player.getCollectionFavorites(); _category = category; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 6001d673b5..67cacdb3e2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI } case "okay": { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) { switch (instance.getTemplateId()) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java index 6610efbd18..77ea59eef5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java @@ -115,7 +115,7 @@ public class Roiental extends AbstractNpcAI public String onFirstTalk(Npc npc, Player player) { String htmltext = null; - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && ((instance.getTemplateId() == TOH_GB_TEMPLATE_ID))) { htmltext = "Roiental-02a.html"; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java index 5aa9c57af1..a497518858 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java @@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java index 72bd59e86f..50da94c8b2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java @@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance } case "checkConditions": { - final Instance Player = getPlayer(player); + final Instance instance = getPlayerInstance(player); final Party playerParty = player.getParty(); - if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID)) + if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID)) { enterInstance(player, npc, TEMPLATE_ID); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index ef7fc0fdee..24067e467f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1270,7 +1270,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1283,7 +1283,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1294,7 +1294,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1302,16 +1302,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1320,7 +1320,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java index 6168792d63..ea13923eb1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { - enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName()))); + enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java index 8e1fb18f01..9e06df3365 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java @@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance @Override public String onAdvEvent(String event, Npc npc, Player player) { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); switch (event) { case "enter_instance": diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java index 343aae82bb..40473df637 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java @@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate"); - final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish"); - final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield"); - final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression"); - final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra"); + final SkillHolder skill1 = instParams.getSkillHolder("adolphHate"); + final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish"); + final SkillHolder skill3 = instParams.getSkillHolder("adolphShield"); + final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression"); + final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra"); final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); final List monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300); if (!monsterList.isEmpty()) { @@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill()); + npc.doCast(skill4.getSkill()); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java index 1418b8a4f9..ced5b92e0e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java @@ -174,11 +174,11 @@ public class KartiaHelperBarton extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity"); - final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker"); - final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane"); - final SkillHolder skill_04 = instParams.getSkillHolder("bartonPowerBomber"); - final SkillHolder skill_05 = instParams.getSkillHolder("bartonSonicStar"); + final SkillHolder skill1 = instParams.getSkillHolder("bartonInfinity"); + final SkillHolder skill2 = instParams.getSkillHolder("bartonBerserker"); + final SkillHolder skill3 = instParams.getSkillHolder("bartonHurricane"); + final SkillHolder skill4 = instParams.getSkillHolder("bartonPowerBomber"); + final SkillHolder skill5 = instParams.getSkillHolder("bartonSonicStar"); final int numberOfActiveSkills = 5; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -187,46 +187,46 @@ public class KartiaHelperBarton extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } case 4: { - if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill())) + if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED); - npc.doCast(skill_04.getSkill(), null, true, false); + npc.doCast(skill4.getSkill(), null, true, false); } break; } case 5: { - if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill())) + if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE); - npc.doCast(skill_05.getSkill(), null, true, false); + npc.doCast(skill5.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java index 14a11229c9..93969008a5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java @@ -175,9 +175,9 @@ public class KartiaHelperHayuk extends AbstractNpcAI if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId()))) { final StatSet instParams = instance.getTemplateParameters(); - final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot"); - final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot"); - final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow"); + final SkillHolder skill1 = instParams.getSkillHolder("hayukPinpointShot"); + final SkillHolder skill2 = instParams.getSkillHolder("hayukRecoilShot"); + final SkillHolder skill3 = instParams.getSkillHolder("hayukMultipleArrow"); final int numberOfActiveSkills = 3; final int randomSkill = getRandom(numberOfActiveSkills + 1); @@ -186,28 +186,28 @@ public class KartiaHelperHayuk extends AbstractNpcAI case 0: case 1: { - if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill())) + if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN); - npc.doCast(skill_01.getSkill(), null, true, false); + npc.doCast(skill1.getSkill(), null, true, false); } break; } case 2: { - if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill())) + if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3); - npc.doCast(skill_02.getSkill(), null, true, false); + npc.doCast(skill2.getSkill(), null, true, false); } break; } case 3: { - if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill())) + if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill())) { npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS); - npc.doCast(skill_03.getSkill(), null, true, false); + npc.doCast(skill3.getSkill(), null, true, false); } break; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index aa6a727738..ab57c2a172 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -76,7 +76,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index e744fb25b9..139ff231bf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -77,7 +77,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 4a5ce54f4a..7a4c3c927f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -74,7 +74,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance } case "reenterInstance": { - final Instance activeInstance = getPlayer(player); + final Instance activeInstance = getPlayerInstance(player); if (isInInstance(activeInstance)) { enterInstance(player, npc, activeInstance.getTemplateId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index a57e40f16d..11289a86bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6b00772f31..c26dd2e03a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -184,7 +184,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java index a16784571a..8c5acc7c08 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java @@ -38,12 +38,12 @@ public class ExCollectionInfo implements IClientOutgoingPacket final List _favoriteList; final int _category; - public ExCollectionInfo(Player Player, int category) + public ExCollectionInfo(Player player, int category) { - _Player = Player; - _categoryList = Player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); + _Player = player; + _categoryList = player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); _collections = _categoryList.stream().map(PlayerCollectionData::getCollectionId).collect(Collectors.toSet()); - _favoriteList = Player.getCollectionFavorites(); + _favoriteList = player.getCollectionFavorites(); _category = category; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java index 8c0e807e7a..d4fba6daa3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java @@ -45,11 +45,11 @@ public class AccountManager System.out.println("3 - Delete existing account (this option _keeps_ character files)"); System.out.println("4 - List accounts & access levels"); System.out.println("5 - exit"); - final LineNumberReader _in = new LineNumberReader(new InputStreamReader(System.in)); + final LineNumberReader in = new LineNumberReader(new InputStreamReader(System.in)); while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4") || _mode.equals("5"))) { System.out.print("Your choice: "); - _mode = _in.readLine(); + _mode = in.readLine(); } if (_mode.equals("1") || _mode.equals("2") || _mode.equals("3")) { @@ -58,7 +58,7 @@ public class AccountManager while (_uname.isEmpty()) { System.out.print("username: "); - _uname = _in.readLine(); + _uname = in.readLine(); } } if (_mode.equals("1")) @@ -66,7 +66,7 @@ public class AccountManager while (_pass.isEmpty()) { System.out.print("password: "); - _pass = _in.readLine(); + _pass = in.readLine(); } } if (_mode.equals("1") || _mode.equals("2")) @@ -74,14 +74,14 @@ public class AccountManager while (_level.isEmpty()) { System.out.print("access level: "); - _level = _in.readLine(); + _level = in.readLine(); } } } if (_mode.equals("3")) { System.out.print("Do you really want to delete this account ? Y/N : "); - final String yesno = _in.readLine(); + final String yesno = in.readLine(); if (!yesno.equals("Y")) { _mode = "5"; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index 015173b01c..10c252b61b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -1334,9 +1334,9 @@ public class Config ALLOW_AIO_IN_EVENTS = generalConfig.getBoolean("AllowAioInEvents", false); if (ENABLE_AIO_SYSTEM) { - final String[] AioSkillsSplit = generalConfig.getString("AioSkills", "").split(";"); - AIO_SKILLS = new HashMap<>(AioSkillsSplit.length); - for (String skill : AioSkillsSplit) + final String[] aioSkillsSplit = generalConfig.getString("AioSkills", "").split(";"); + AIO_SKILLS = new HashMap<>(aioSkillsSplit.length); + for (String skill : aioSkillsSplit) { final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java index 71b08d81d8..2f519a0c18 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java @@ -197,15 +197,15 @@ public class AdminBuffs implements IAdminCommandHandler activeChar.sendPacket(ms); } - private void removeBuff(Player remover, String playername, int SkillId) + private void removeBuff(Player remover, String playername, int skillId) { final Player player = World.getInstance().getPlayer(playername); - if ((player != null) && (SkillId > 0)) + if ((player != null) && (skillId > 0)) { final Effect[] effects = player.getAllEffects().toArray(new Effect[0]); for (Effect e : effects) { - if ((e != null) && (e.getSkill().getId() == SkillId)) + if ((e != null) && (e.getSkill().getId() == skillId)) { e.exit(true); remover.sendMessage("Removed " + e.getSkill().getName() + " level " + e.getSkill().getLevel() + " from " + playername); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java index 228e8b369d..c8b8c48243 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java @@ -65,7 +65,7 @@ public class AdminMammon implements IAdminCommandHandler teleportIndex = Integer.parseInt(command.substring(18)); } } - catch (Exception NumberFormatException) + catch (Exception e) { BuilderUtil.sendSysMessage(activeChar, "Usage: //mammon_find [teleportIndex] (where 1 = Blacksmith, 2 = Merchant)"); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java index 5604d28184..33de817ea2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java @@ -1121,8 +1121,8 @@ public class TradeList return false; } - final Item Item = (Item) obj; - if (item.getEnchant() != Item.getEnchantLevel()) + final Item foundItem = (Item) obj; + if (item.getEnchant() != foundItem.getEnchantLevel()) { final String msgErr = "[RequestPrivateStoreSell] player " + _owner.getName() + " tried to change enchant level in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(_owner, msgErr, Config.DEFAULT_PUNISH); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index 5971dc23a0..b6f1be8be6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -12498,11 +12498,11 @@ public class Player extends Playable } } - public void broadcastSnoop(ChatType _chatType, String name, String text, CreatureSay cs) + public void broadcastSnoop(ChatType chatType, String name, String text, CreatureSay cs) { if (!_snoopListener.isEmpty()) { - final Snoop sn = new Snoop(this, _chatType, name, text); + final Snoop sn = new Snoop(this, chatType, name, text); for (Player pci : _snoopListener) { if (pci != null) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 2aee4ec685..6448ce9561 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -466,7 +466,7 @@ public class SignsPriest extends Folk { convertCount = Integer.parseInt(command.substring(19).trim()); } - catch (Exception NumberFormatException) + catch (Exception e) { player.sendMessage("You must enter an integer amount."); break; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index cde2f0d156..40a27116e4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -236,7 +236,7 @@ public class VillageMaster extends Folk paramOne = Integer.parseInt(command.substring(11, endIndex).trim()); } } - catch (Exception NumberFormatException) + catch (Exception e) { } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 1d29200845..c6b3fc863f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -462,7 +462,7 @@ public class PlayerInventory extends Inventory @Override public Item destroyItem(String process, Item item, Player actor, WorldObject reference) { - final Item Item = super.destroyItem(process, item, actor, reference); + final Item destroyedItem = super.destroyItem(process, item, actor, reference); if ((_adena != null) && (_adena.getCount() <= 0)) { @@ -474,7 +474,7 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - return Item; + return destroyedItem; } /** @@ -542,7 +542,7 @@ public class PlayerInventory extends Inventory @Override public Item dropItem(String process, Item item, Player actor, WorldObject reference) { - final Item Item = super.dropItem(process, item, actor, reference); + final Item droppedItem = super.dropItem(process, item, actor, reference); if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) { @@ -554,7 +554,7 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - return Item; + return droppedItem; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index 5e86c1c154..2daaee91cb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -31,10 +31,10 @@ public class Snoop implements IClientOutgoingPacket private final String _speaker; private final String _msg; - public Snoop(Player snooped, ChatType _chatType, String speaker, String msg) + public Snoop(Player snooped, ChatType chatType, String speaker, String msg) { _snooped = snooped; - _type = _chatType; + _type = chatType; _speaker = speaker; _msg = msg; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java index fa231296b2..71d988fc21 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java @@ -101,14 +101,14 @@ public class GameServerTable private void loadRSAKeys() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { - final KeyPairGenerator _keyGen = KeyPairGenerator.getInstance("RSA"); + final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); final RSAKeyGenParameterSpec spec = new RSAKeyGenParameterSpec(512, RSAKeyGenParameterSpec.F4); - _keyGen.initialize(spec); + keyGen.initialize(spec); _keyPairs = new KeyPair[KEYS_SIZE]; for (int i = 0; i < 10; i++) { - _keyPairs[i] = _keyGen.generateKeyPair(); + _keyPairs[i] = keyGen.generateKeyPair(); } LOGGER.info("Cached " + _keyPairs.length + " RSA keys for Game Server communication."); @@ -192,11 +192,11 @@ public class GameServerTable } } - public GameServerThread getGameServerThread(int ServerID) + public GameServerThread getGameServerThread(int serverId) { for (GameServer gs : _gameServerList) { - if (gs.serverId == ServerID) + if (gs.serverId == serverId) { return gs.gst; } @@ -204,11 +204,11 @@ public class GameServerTable return null; } - public int getGameServerStatus(int ServerID) + public int getGameServerStatus(int serverId) { for (GameServer gs : _gameServerList) { - if (gs.serverId == ServerID) + if (gs.serverId == serverId) { return gs.status; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java index f1b0925a01..09ebaf650d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java @@ -170,14 +170,14 @@ public class LoginController return playerCount; } - public int getOnlinePlayerCount(int ServerID) + public int getOnlinePlayerCount(int serverId) { final List gslist = LoginServer.getGameServerListener().getGameServerThreads(); synchronized (gslist) { for (GameServerThread gs : gslist) { - if (gs.getServerID() == ServerID) + if (gs.getServerID() == serverId) { return gs.getCurrentPlayers(); } @@ -186,14 +186,14 @@ public class LoginController return 0; } - public int getMaxAllowedOnlinePlayers(int ServerID) + public int getMaxAllowedOnlinePlayers(int serverId) { final List gslist = LoginServer.getGameServerListener().getGameServerThreads(); synchronized (gslist) { for (GameServerThread gs : gslist) { - if (gs.getServerID() == ServerID) + if (gs.getServerID() == serverId) { return gs.getMaxPlayers(); } @@ -209,12 +209,12 @@ public class LoginController /** * @param access - * @param ServerID + * @param serverId * @return */ - public boolean loginPossible(int access, int ServerID) + public boolean loginPossible(int access, int serverId) { - return ((getOnlinePlayerCount(ServerID) < _maxAllowedOnlinePlayers) || (access >= 50)); + return ((getOnlinePlayerCount(serverId) < _maxAllowedOnlinePlayers) || (access >= 50)); } public void setAccountAccessLevel(String account, int banLevel) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java index 1e0fa63f44..adcbd164e8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java @@ -405,7 +405,7 @@ public class GameStatusThread extends Thread { _print.println("Please Enter * amount of seconds to shutdown!"); } - catch (Exception NumberFormatException) + catch (Exception e) { _print.println("Numbers Only!"); } @@ -423,7 +423,7 @@ public class GameStatusThread extends Thread { _print.println("Please Enter * amount of seconds to restart!"); } - catch (Exception NumberFormatException) + catch (Exception e) { _print.println("Numbers Only!"); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/accountmanager/SQLAccountManager.java index a3e870739d..1402030630 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -59,11 +59,11 @@ public class SQLAccountManager System.out.println("3 - Delete existing account."); System.out.println("4 - List accounts & access levels."); System.out.println("5 - Exit."); - final LineNumberReader _in = new LineNumberReader(new InputStreamReader(System.in)); + final LineNumberReader in = new LineNumberReader(new InputStreamReader(System.in)); while ((!_mode.equals("1") && !_mode.equals("2") && !_mode.equals("3") && !_mode.equals("4") && !_mode.equals("5"))) { System.out.print("Your choice: "); - _mode = _in.readLine(); + _mode = in.readLine(); } if (_mode.equals("1") || _mode.equals("2") || _mode.equals("3")) @@ -73,7 +73,7 @@ public class SQLAccountManager while (_uname.trim().length() == 0) { System.out.print("Username: "); - _uname = _in.readLine().toLowerCase(); + _uname = in.readLine().toLowerCase(); } } else if (_mode.equals("3")) @@ -81,7 +81,7 @@ public class SQLAccountManager while (_uname.trim().length() == 0) { System.out.print("Account name: "); - _uname = _in.readLine().toLowerCase(); + _uname = in.readLine().toLowerCase(); } } if (_mode.equals("1")) @@ -89,7 +89,7 @@ public class SQLAccountManager while (_pass.trim().length() == 0) { System.out.print("Password: "); - _pass = _in.readLine(); + _pass = in.readLine(); } } if (_mode.equals("1") || _mode.equals("2")) @@ -97,7 +97,7 @@ public class SQLAccountManager while (_level.trim().length() == 0) { System.out.print("Access level: "); - _level = _in.readLine(); + _level = in.readLine(); } } } @@ -116,7 +116,7 @@ public class SQLAccountManager { // Delete System.out.print("Do you really want to delete this account ? Y/N : "); - final String yesno = _in.readLine(); + final String yesno = in.readLine(); if (yesno.equalsIgnoreCase("Y")) { deleteAccount(_uname.trim()); @@ -140,7 +140,7 @@ public class SQLAccountManager while ((!_mode.equals("1") && !_mode.equals("2") && !_mode.equals("3") && !_mode.equals("4"))) { System.out.print("Your choice: "); - _mode = _in.readLine(); + _mode = in.readLine(); } System.out.println(""); printAccInfo(_mode); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java index f2a137b919..09ec7ead38 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java @@ -53,12 +53,12 @@ public class GameServerRegister System.out.println("Enter The id of the server you want to register or type help to get a list of ids:"); try (InputStreamReader ir = new InputStreamReader(System.in); - LineNumberReader _in = new LineNumberReader(ir)) + LineNumberReader in = new LineNumberReader(ir)) { while (true) { System.out.println("Your choice:"); - _choice = _in.readLine(); + _choice = in.readLine(); if (_choice.equalsIgnoreCase("help")) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index 5286b75515..3d4f976e46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -1385,9 +1385,9 @@ public class Config ALLOW_AIO_IN_EVENTS = generalConfig.getBoolean("AllowAioInEvents", false); if (ENABLE_AIO_SYSTEM) { - final String[] AioSkillsSplit = generalConfig.getString("AioSkills", "").split(";"); - AIO_SKILLS = new HashMap<>(AioSkillsSplit.length); - for (String skill : AioSkillsSplit) + final String[] aioSkillsSplit = generalConfig.getString("AioSkills", "").split(";"); + AIO_SKILLS = new HashMap<>(aioSkillsSplit.length); + for (String skill : aioSkillsSplit) { final String[] skillSplit = skill.split(","); if (skillSplit.length != 2) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java index 71b08d81d8..2f519a0c18 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBuffs.java @@ -197,15 +197,15 @@ public class AdminBuffs implements IAdminCommandHandler activeChar.sendPacket(ms); } - private void removeBuff(Player remover, String playername, int SkillId) + private void removeBuff(Player remover, String playername, int skillId) { final Player player = World.getInstance().getPlayer(playername); - if ((player != null) && (SkillId > 0)) + if ((player != null) && (skillId > 0)) { final Effect[] effects = player.getAllEffects().toArray(new Effect[0]); for (Effect e : effects) { - if ((e != null) && (e.getSkill().getId() == SkillId)) + if ((e != null) && (e.getSkill().getId() == skillId)) { e.exit(true); remover.sendMessage("Removed " + e.getSkill().getName() + " level " + e.getSkill().getLevel() + " from " + playername); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java index 228e8b369d..c8b8c48243 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java @@ -65,7 +65,7 @@ public class AdminMammon implements IAdminCommandHandler teleportIndex = Integer.parseInt(command.substring(18)); } } - catch (Exception NumberFormatException) + catch (Exception e) { BuilderUtil.sendSysMessage(activeChar, "Usage: //mammon_find [teleportIndex] (where 1 = Blacksmith, 2 = Merchant)"); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 9bf42a7b7d..5c3806db95 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -1133,8 +1133,8 @@ public class TradeList return false; } - final Item Item = (Item) obj; - if (item.getEnchant() != Item.getEnchantLevel()) + final Item foundItem = (Item) obj; + if (item.getEnchant() != foundItem.getEnchantLevel()) { final String msgErr = "[RequestPrivateStoreSell] player " + _owner.getName() + " tried to change enchant level in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(_owner, msgErr, Config.DEFAULT_PUNISH); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index e167e29f0f..a24c4ea2ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -12803,11 +12803,11 @@ public class Player extends Playable } } - public void broadcastSnoop(ChatType _chatType, String name, String text, CreatureSay cs) + public void broadcastSnoop(ChatType chatType, String name, String text, CreatureSay cs) { if (!_snoopListener.isEmpty()) { - final Snoop sn = new Snoop(this, _chatType, name, text); + final Snoop sn = new Snoop(this, chatType, name, text); for (Player pci : _snoopListener) { if (pci != null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 2aee4ec685..6448ce9561 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -466,7 +466,7 @@ public class SignsPriest extends Folk { convertCount = Integer.parseInt(command.substring(19).trim()); } - catch (Exception NumberFormatException) + catch (Exception e) { player.sendMessage("You must enter an integer amount."); break; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 6aa0d111cc..b565272c2b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -242,7 +242,7 @@ public class VillageMaster extends Folk paramOne = Integer.parseInt(command.substring(11, endIndex).trim()); } } - catch (Exception NumberFormatException) + catch (Exception e) { } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b9820ba13d..4bcf7db6e1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -479,7 +479,7 @@ public class PlayerInventory extends Inventory @Override public Item destroyItem(String process, Item item, Player actor, WorldObject reference) { - final Item Item = super.destroyItem(process, item, actor, reference); + final Item destroyedItem = super.destroyItem(process, item, actor, reference); if ((_adena != null) && (_adena.getCount() <= 0)) { @@ -491,7 +491,7 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - return Item; + return destroyedItem; } /** @@ -559,7 +559,7 @@ public class PlayerInventory extends Inventory @Override public Item dropItem(String process, Item item, Player actor, WorldObject reference) { - final Item Item = super.dropItem(process, item, actor, reference); + final Item droppedItem = super.dropItem(process, item, actor, reference); if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) { @@ -571,7 +571,7 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - return Item; + return droppedItem; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index 5e86c1c154..2daaee91cb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -31,10 +31,10 @@ public class Snoop implements IClientOutgoingPacket private final String _speaker; private final String _msg; - public Snoop(Player snooped, ChatType _chatType, String speaker, String msg) + public Snoop(Player snooped, ChatType chatType, String speaker, String msg) { _snooped = snooped; - _type = _chatType; + _type = chatType; _speaker = speaker; _msg = msg; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java index 1e0fa63f44..adcbd164e8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java @@ -405,7 +405,7 @@ public class GameStatusThread extends Thread { _print.println("Please Enter * amount of seconds to shutdown!"); } - catch (Exception NumberFormatException) + catch (Exception e) { _print.println("Numbers Only!"); } @@ -423,7 +423,7 @@ public class GameStatusThread extends Thread { _print.println("Please Enter * amount of seconds to restart!"); } - catch (Exception NumberFormatException) + catch (Exception e) { _print.println("Numbers Only!"); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java index 7e8ba51c38..7b5a11381b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java @@ -386,8 +386,8 @@ public class Race extends Event private void winRace(Player player) { - final int[] _reward = _rewards[getRandom(_rewards.length - 1)]; - player.addItem("eventModRace", _reward[0], _reward[1], _npc, true); + final int[] reward = _rewards[getRandom(_rewards.length - 1)]; + player.addItem("eventModRace", reward[0], reward[1], _npc, true); Broadcast.toAllOnlinePlayers(player.getName() + " is a winner!"); eventStop(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 2d6fb2d125..b444b4825b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -80,13 +80,13 @@ public class SoulShots implements IItemHandler } // Consume Soul shots if player has enough of them - int SSCount = weaponItem.getSoulShotCount(); + int count = weaponItem.getSoulShotCount(); if ((weaponItem.getReducedSoulShot() > 0) && (Rnd.get(100) < weaponItem.getReducedSoulShotChance())) { - SSCount = weaponItem.getReducedSoulShot(); + count = weaponItem.getReducedSoulShot(); } - if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false)) + if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), count, null, false)) { if (!player.disableAutoShot(itemId)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index e805401346..52c74f5945 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -965,8 +965,8 @@ public class DarkCloudMansion extends AbstractInstance } if (world.getStatus() == 4) { - final DMCRoom SecondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class); - for (DMCNpc mob : SecondRoom.npcList) + final DMCRoom secondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class); + for (DMCNpc mob : secondRoom.npcList) { if (mob.golem == npc) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index 3dd354af7b..d6e83a9182 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -443,33 +443,33 @@ public class TerritoryWarSuperClass extends Quest private void handleStepsForHonor(Player player) { - final QuestState _sfh = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); - if ((_sfh != null) && _sfh.isStarted()) + final QuestState q176 = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); + if ((q176 != null) && q176.isStarted()) { - final int cond = _sfh.getCond(); + final int cond = q176.getCond(); if ((cond == 1) || (cond == 3) || (cond == 5) || (cond == 7)) { - final int kills = _sfh.getInt("kills") + 1; - _sfh.set("kills", kills); + final int kills = q176.getInt("kills") + 1; + q176.set("kills", kills); if ((cond == 1) && (kills >= 9)) { - _sfh.setCond(2); - _sfh.set("kills", "0"); + q176.setCond(2); + q176.set("kills", "0"); } else if ((cond == 3) && (kills >= 18)) { - _sfh.setCond(4); - _sfh.set("kills", "0"); + q176.setCond(4); + q176.set("kills", "0"); } else if ((cond == 5) && (kills >= 27)) { - _sfh.setCond(6); - _sfh.set("kills", "0"); + q176.setCond(6); + q176.set("kills", "0"); } else if ((cond == 7) && (kills >= 36)) { - _sfh.setCond(8); - _sfh.unset("kills"); + q176.setCond(8); + q176.unset("kills"); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java index 6f1e4cfa2f..456c708822 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java @@ -2840,8 +2840,8 @@ public class Config ENABLE_FIND_PVP = findPvpConfig.getBoolean("EnableFindPvP", false); // Load HellboundStatus config file (if exists) - final PropertiesParser HellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE); - HELLBOUND_STATUS = HellboundStatusConfig.getBoolean("HellboundStatus", false); + final PropertiesParser hellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE); + HELLBOUND_STATUS = hellboundStatusConfig.getBoolean("HellboundStatus", false); // Load MerchantZeroSellPrice config file (if exists) final PropertiesParser merchantZeroSellPriceConfig = new PropertiesParser(CUSTOM_MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1f4fa26f12..d0984a826d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -582,15 +582,15 @@ public class EnterWorld implements IClientIncomingPacket if (birthday == 0) { final QuestState qs = player.getQuestState("CharacterBirthday"); - String NextBirthday = null; + String nextBirthday = null; if (qs != null) { - NextBirthday = qs.get("Birthday"); + nextBirthday = qs.get("Birthday"); } final Calendar now = Calendar.getInstance(); now.setTimeInMillis(Chronos.currentTimeMillis()); - if ((NextBirthday == null) || (Integer.parseInt(NextBirthday) == now.get(Calendar.YEAR))) + if ((nextBirthday == null) || (Integer.parseInt(nextBirthday) == now.get(Calendar.YEAR))) { player.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT); player.sendPacket(new ExBirthdayPopup()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java index 7e8ba51c38..7b5a11381b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java @@ -386,8 +386,8 @@ public class Race extends Event private void winRace(Player player) { - final int[] _reward = _rewards[getRandom(_rewards.length - 1)]; - player.addItem("eventModRace", _reward[0], _reward[1], _npc, true); + final int[] reward = _rewards[getRandom(_rewards.length - 1)]; + player.addItem("eventModRace", reward[0], reward[1], _npc, true); Broadcast.toAllOnlinePlayers(player.getName() + " is a winner!"); eventStop(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 2d6fb2d125..b444b4825b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -80,13 +80,13 @@ public class SoulShots implements IItemHandler } // Consume Soul shots if player has enough of them - int SSCount = weaponItem.getSoulShotCount(); + int count = weaponItem.getSoulShotCount(); if ((weaponItem.getReducedSoulShot() > 0) && (Rnd.get(100) < weaponItem.getReducedSoulShotChance())) { - SSCount = weaponItem.getReducedSoulShot(); + count = weaponItem.getReducedSoulShot(); } - if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false)) + if (!player.destroyItemWithoutTrace("Consume", item.getObjectId(), count, null, false)) { if (!player.disableAutoShot(itemId)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index e805401346..52c74f5945 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -965,8 +965,8 @@ public class DarkCloudMansion extends AbstractInstance } if (world.getStatus() == 4) { - final DMCRoom SecondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class); - for (DMCNpc mob : SecondRoom.npcList) + final DMCRoom secondRoom = world.getParameters().getObject("SecondRoom", DMCRoom.class); + for (DMCNpc mob : secondRoom.npcList) { if (mob.golem == npc) { 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 3dd354af7b..d6e83a9182 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 @@ -443,33 +443,33 @@ public class TerritoryWarSuperClass extends Quest private void handleStepsForHonor(Player player) { - final QuestState _sfh = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); - if ((_sfh != null) && _sfh.isStarted()) + final QuestState q176 = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); + if ((q176 != null) && q176.isStarted()) { - final int cond = _sfh.getCond(); + final int cond = q176.getCond(); if ((cond == 1) || (cond == 3) || (cond == 5) || (cond == 7)) { - final int kills = _sfh.getInt("kills") + 1; - _sfh.set("kills", kills); + final int kills = q176.getInt("kills") + 1; + q176.set("kills", kills); if ((cond == 1) && (kills >= 9)) { - _sfh.setCond(2); - _sfh.set("kills", "0"); + q176.setCond(2); + q176.set("kills", "0"); } else if ((cond == 3) && (kills >= 18)) { - _sfh.setCond(4); - _sfh.set("kills", "0"); + q176.setCond(4); + q176.set("kills", "0"); } else if ((cond == 5) && (kills >= 27)) { - _sfh.setCond(6); - _sfh.set("kills", "0"); + q176.setCond(6); + q176.set("kills", "0"); } else if ((cond == 7) && (kills >= 36)) { - _sfh.setCond(8); - _sfh.unset("kills"); + q176.setCond(8); + q176.unset("kills"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java index e700192a63..ba6c584e35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java @@ -2847,8 +2847,8 @@ public class Config ENABLE_FIND_PVP = findPvpConfig.getBoolean("EnableFindPvP", false); // Load HellboundStatus config file (if exists) - final PropertiesParser HellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE); - HELLBOUND_STATUS = HellboundStatusConfig.getBoolean("HellboundStatus", false); + final PropertiesParser hellboundStatusConfig = new PropertiesParser(CUSTOM_HELLBOUND_STATUS_CONFIG_FILE); + HELLBOUND_STATUS = hellboundStatusConfig.getBoolean("HellboundStatus", false); // Load MerchantZeroSellPrice config file (if exists) final PropertiesParser merchantZeroSellPriceConfig = new PropertiesParser(CUSTOM_MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 04e2e145f1..0cbad80342 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 84f92499cc..0bad774c4c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 52d445c335..5c0a6275f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -174,7 +174,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c424b903be..b81b25c3d7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -37,7 +37,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 04e2e145f1..0cbad80342 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 84f92499cc..0bad774c4c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4cb7516ea4..0701ae1aac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -174,7 +174,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 88f2e40620..fba44de1d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 84f92499cc..0bad774c4c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 02e4946353..cb8bfca9db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 88f2e40620..fba44de1d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java index 2218ed5311..b039112329 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5cbd66d6a8..07a6beff44 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 02e4946353..cb8bfca9db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 88f2e40620..fba44de1d3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java index cf07c14144..c5c1387eb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index b6803ce5f4..a899606754 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -663,7 +663,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5cbd66d6a8..07a6beff44 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 02e4946353..cb8bfca9db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -175,7 +175,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 8b5ac509d3..4d33cadd6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1222,7 +1222,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1235,7 +1235,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1246,7 +1246,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1254,16 +1254,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1272,7 +1272,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java index cf07c14144..c5c1387eb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index b6803ce5f4..a899606754 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -663,7 +663,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5cbd66d6a8..07a6beff44 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 326b6050c3..9eaf88ad5c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -176,7 +176,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index da55466fa9..6b831b6110 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -94,13 +94,12 @@ public class DrChaos extends AbstractNpcAI final GrandBoss golem = (GrandBoss) addSpawn(CHAOS_GOLEM, loc_x, loc_y, loc_z, heading, false, 0, false); GrandBossManager.getInstance().addBoss(golem); - final Npc _golem = golem; - _golem.setCurrentHpMp(hp, mp); - _golem.setRunning(); + golem.setCurrentHpMp(hp, mp); + golem.setRunning(); // start monitoring Dr. Chaos's inactivity _lastAttackVsGolem = Chronos.currentTimeMillis(); - startQuestTimer("golem_despawn", 60000, _golem, null, true); + startQuestTimer("golem_despawn", 60000, golem, null, true); } // Spawn the regular NPC. else diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java index 96ace3a4e3..f17f99ae6f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java @@ -662,7 +662,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java index 5b86363fc7..d884f0b317 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/RudolphsBlessing/RudolphsBlessing.java @@ -67,8 +67,8 @@ public class RudolphsBlessing extends LongTimeEvent if (takeItems(player, ITEM_REQUIREMENT.getId(), ITEM_REQUIREMENT.getCount())) { SkillCaster.triggerCast(player, player, RUDOLPH_TRYUCK.getSkill()); - final Skill RudolphsBlessing = SkillData.getInstance().getSkill(23297, 1); - RudolphsBlessing.applyEffects(player, player); + final Skill rudolphsBlessing = SkillData.getInstance().getSkill(23297, 1); + rudolphsBlessing.applyEffects(player, player); } startQuestTimer("rudolph_eat", 10 * 60 * 1000, null, player); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 04e2e145f1..0cbad80342 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1230,7 +1230,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1243,7 +1243,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1254,7 +1254,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1262,16 +1262,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1280,7 +1280,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java index b0e8a24c02..f3d89ef630 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index edda6dd19d..ca72d5b02d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -250,16 +250,16 @@ public class Q00350_EnhanceYourWeapon extends Quest private static void exchangeCrystal(Player player, Attackable mob, int takeid, int giveid, boolean broke) { - Item Item = player.getInventory().destroyItemByItemId("SoulCrystal", takeid, 1, player, mob); - if (Item != null) + Item item = player.getInventory().destroyItemByItemId("SoulCrystal", takeid, 1, player, mob); + if (item != null) { // Prepare inventory update packet final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addRemovedItem(Item); + playerIU.addRemovedItem(item); // Add new crystal to the killer's inventory - Item = player.getInventory().addItem("SoulCrystal", giveid, 1, player, mob); - playerIU.addItem(Item); + item = player.getInventory().addItem("SoulCrystal", giveid, 1, player, mob); + playerIU.addItem(item); // Send a sound event and text message to the player if (broke) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 2865acbdfd..7f156f89da 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -432,7 +432,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 84f92499cc..0bad774c4c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -984,21 +984,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 214cd84e86..eb04872332 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -172,7 +172,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index a239d44e07..f6e01ceaaa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1231,7 +1231,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1244,7 +1244,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1255,7 +1255,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1263,16 +1263,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1281,7 +1281,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java index cf07c14144..c5c1387eb3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index af9f3c3896..1b05595453 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -663,7 +663,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5cbd66d6a8..07a6beff44 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index bacbd5a16c..999d00ac29 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -181,7 +181,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index a239d44e07..f6e01ceaaa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1231,7 +1231,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1244,7 +1244,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1255,7 +1255,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1263,16 +1263,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1281,7 +1281,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java index cf07c14144..c5c1387eb3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index c8211a0900..e1eb3ca402 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -663,7 +663,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 5cbd66d6a8..07a6beff44 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aebcdcd146..250ff49cac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -185,7 +185,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java index a16784571a..8c5acc7c08 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java @@ -38,12 +38,12 @@ public class ExCollectionInfo implements IClientOutgoingPacket final List _favoriteList; final int _category; - public ExCollectionInfo(Player Player, int category) + public ExCollectionInfo(Player player, int category) { - _Player = Player; - _categoryList = Player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); + _Player = player; + _categoryList = player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); _collections = _categoryList.stream().map(PlayerCollectionData::getCollectionId).collect(Collectors.toSet()); - _favoriteList = Player.getCollectionFavorites(); + _favoriteList = player.getCollectionFavorites(); _category = category; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index a239d44e07..f6e01ceaaa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -1231,7 +1231,7 @@ public class AdminEditChar implements IAdminCommandHandler */ private void findCharacter(Player activeChar, String characterToFind) { - int CharactersFound = 0; + int charactersFound = 0; String name; final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1); adminReply.setFile(activeChar, "data/html/admin/charfind.htm"); @@ -1244,7 +1244,7 @@ public class AdminEditChar implements IAdminCommandHandler name = player.getName(); if (name.toLowerCase().contains(characterToFind.toLowerCase())) { - CharactersFound += 1; + charactersFound += 1; replyMSG.append(""); @@ -1255,7 +1255,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(""); } - if (CharactersFound > 20) + if (charactersFound > 20) { break; } @@ -1263,16 +1263,16 @@ public class AdminEditChar implements IAdminCommandHandler adminReply.replace("%results%", replyMSG.toString()); final String replyMSG2; - if (CharactersFound == 0) + if (charactersFound == 0) { replyMSG2 = "s. Please try again."; } - else if (CharactersFound > 20) + else if (charactersFound > 20) { adminReply.replace("%number%", " more than 20"); replyMSG2 = "s.
Please refine your search to see all of the results."; } - else if (CharactersFound == 1) + else if (charactersFound == 1) { replyMSG2 = "."; } @@ -1281,7 +1281,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG2 = "s."; } - adminReply.replace("%number%", String.valueOf(CharactersFound)); + adminReply.replace("%number%", String.valueOf(charactersFound)); adminReply.replace("%end%", replyMSG2); activeChar.sendPacket(adminReply); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java index 9212858ee4..ea13923eb1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java @@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param player player who wants get instance world * @return instance world if found, otherwise null */ - public Instance getPlayer(Player player) + public Instance getPlayerInstance(Player player) { - return InstanceManager.getInstance().getPlayer(player, false); + return InstanceManager.getInstance().getPlayerInstance(player, false); } /** @@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI */ protected final void enterInstance(Player player, Npc npc, int templateId) { - Instance instance = getPlayer(player); + Instance instance = getPlayerInstance(player); if (instance != null) // Player has already any instance active { if (instance.getTemplateId() != templateId) @@ -153,7 +153,7 @@ public abstract class AbstractInstance extends AbstractNpcAI // Check if any player from enter group has active instance for (Player member : enterGroup) { - if (getPlayer(member) != null) + if (getPlayerInstance(member) != null) { enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName()))); return; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java index cd88c30c9b..acd20bba99 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java @@ -663,7 +663,7 @@ public class LastImperialTomb extends AbstractInstance } else // Teleport Cube { - final Instance world = getPlayer(player); + final Instance world = getPlayerInstance(player); if (world != null) { teleportPlayerOut(player, world); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index dceb847f96..123042a55d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -436,7 +436,7 @@ public class InstanceManager implements IXmlReader * @param isInside when {@code true} find world where player is currently located, otherwise find world where player can enter * @return instance if found, otherwise {@code null} */ - public Instance getPlayer(Player player, boolean isInside) + public Instance getPlayerInstance(Player player, boolean isInside) { for (Instance instance : _instanceWorlds.values()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 6b78509b47..fb47cce094 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -421,12 +421,12 @@ public abstract class ItemContainer */ public Item detachItem(String process, int itemObjectId, long count, ItemLocation newLocation, Player actor, Object reference) { - final Item Item = getItemByObjectId(itemObjectId); - if (Item == null) + final Item item = getItemByObjectId(itemObjectId); + if (item == null) { return null; } - return detachItem(process, Item, count, newLocation, actor, reference); + return detachItem(process, item, count, newLocation, actor, reference); } /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 816bb6f138..2e34b8cb6f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -985,21 +985,21 @@ public class Formulas */ public static double calcAttributeBonus(Creature attacker, Creature target, Skill skill) { - int attack_attribute; - int defence_attribute; + int attackAttribute; + int defenceAttribute; if ((skill != null) && (skill.getAttributeType() != AttributeType.NONE)) { - attack_attribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); - defence_attribute = target.getDefenseElementValue(skill.getAttributeType()); + attackAttribute = attacker.getAttackElementValue(skill.getAttributeType()) + skill.getAttributeValue(); + defenceAttribute = target.getDefenseElementValue(skill.getAttributeType()); } else { - attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()); - defence_attribute = target.getDefenseElementValue(attacker.getAttackElement()); + attackAttribute = attacker.getAttackElementValue(attacker.getAttackElement()); + defenceAttribute = target.getDefenseElementValue(attacker.getAttackElement()); } - final int diff = attack_attribute - defence_attribute; + final int diff = attackAttribute - defenceAttribute; if (diff > 0) { return Math.min(1.025 + (Math.sqrt(Math.pow(diff, 3) / 2) * 0.0001), 1.25); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 206188ba97..05fc2c688d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -185,7 +185,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.RESTORE_PLAYER_INSTANCE) { final PlayerVariables vars = player.getVariables(); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); if ((instance != null) && (instance.getId() == vars.getInt("INSTANCE_RESTORE", 0))) { player.setInstance(instance); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index 0baca7cd86..c1f7bb396b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -38,7 +38,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public ExInzoneWaiting(Player player, boolean hide) { - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); _currentTemplateId = ((instance != null) && (instance.getTemplateId() >= 0)) ? instance.getTemplateId() : -1; _instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); _hide = hide; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index eafea24fa6..2d607b9a02 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -68,7 +68,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeS(player.getName()); packet.writeD(player.getClassId().getId()); packet.writeD(player.getLevel()); - final Instance instance = InstanceManager.getInstance().getPlayer(player, false); + final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); packet.writeD((instance != null) && (instance.getTemplateId() >= 0) ? instance.getTemplateId() : -1); final Map instanceTimes = InstanceManager.getInstance().getAllInstanceTimes(player); packet.writeD(instanceTimes.size()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java index a16784571a..8c5acc7c08 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionInfo.java @@ -38,12 +38,12 @@ public class ExCollectionInfo implements IClientOutgoingPacket final List _favoriteList; final int _category; - public ExCollectionInfo(Player Player, int category) + public ExCollectionInfo(Player player, int category) { - _Player = Player; - _categoryList = Player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); + _Player = player; + _categoryList = player.getCollections().stream().filter(it -> CollectionData.getInstance().getCollection(it.getCollectionId()).getCategory() == category).collect(Collectors.toList()); _collections = _categoryList.stream().map(PlayerCollectionData::getCollectionId).collect(Collectors.toSet()); - _favoriteList = Player.getCollectionFavorites(); + _favoriteList = player.getCollectionFavorites(); _category = category; }